diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 414a564b7d6dca6804e5a249845ae731ef8522e2..34659b7b2f96731568d2aa25e8427b1bd53719b2 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -105,7 +105,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
}
}
-#if LIBAVCODEC_VERSION_MINOR < 53
+#if LIBAVCODEC_VERSION_MAJOR < 53
/**
*
* @param buf input
diff --git a/libavformat/applehttpproto.c b/libavformat/applehttpproto.c
index 6f42992c130efe0c659ea81f9ea8071d25e91630..168b2513bbd96b7e85094493d13eb5db1ca798dd 100644
--- a/libavformat/applehttpproto.c
+++ b/libavformat/applehttpproto.c
@@ -181,7 +181,7 @@ static int applehttp_open(URLContext *h, const char *uri, int flags)
const char *nested_url;
if (flags & (URL_WRONLY | URL_RDWR))
- return AVERROR_NOTSUPP;
+ return AVERROR(ENOSYS);
s = av_mallocz(sizeof(AppleHTTPContext));
if (!s)
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index e04d92ae659280fab9333e7a3ef0d6b06ed5690b..3dc28f21feb84ae5c1ab3c21d9d5d9b9dcd33714 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -168,7 +168,7 @@ static int read_seek2(AVFormatContext *s, int stream_index,
ASSContext *ass = s->priv_data;
if (flags & AVSEEK_FLAG_BYTE) {
- return AVERROR_NOTSUPP;
+ return AVERROR(ENOSYS);
} else if (flags & AVSEEK_FLAG_FRAME) {
if (ts < 0 || ts >= ass->event_count)
return AVERROR(ERANGE);
diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c
index 448ac00365cd0dae4dc6204912d22fa9aff4e9cc..ae070c5e965ed835161bfd702ba5393de067c0c1 100644
--- a/libavformat/jvdec.c
+++ b/libavformat/jvdec.c
@@ -192,7 +192,7 @@ static int read_seek(AVFormatContext *s, int stream_index,
int i;
if (flags & (AVSEEK_FLAG_BYTE|AVSEEK_FLAG_FRAME))
- return AVERROR_NOTSUPP;
+ return AVERROR(ENOSYS);
switch(stream_index) {
case 0:
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index 20978c674eabacc251a6326a7368f5fcc9e9c88c..0907cb71c037ee9458172c574cb952696b191d4a 100644
--- a/libavformat/lxfdec.c
+++ b/libavformat/lxfdec.c
@@ -218,7 +218,7 @@ static int lxf_read_header(AVFormatContext *s, AVFormatParameters *ap)
return ret < 0 ? ret : AVERROR_EOF;
if (!(st = av_new_stream(s, 0)))
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
st->duration = AV_RL32(&header_data[32]);
video_params = AV_RL32(&header_data[40]);
@@ -244,7 +244,7 @@ static int lxf_read_header(AVFormatContext *s, AVFormatParameters *ap)
if ((lxf->channels = (disk_params >> 2) & 0xF)) {
if (!(st = av_new_stream(s, 1)))
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->sample_rate = LXF_SAMPLERATE;
diff --git a/libavformat/mmst.c b/libavformat/mmst.c
index 89dd5b3c3cfe933a8ffaac83fd2319907bb2aacc..d7a1dda5bd184eb50c3abdc351b37185b29079a9 100644
--- a/libavformat/mmst.c
+++ b/libavformat/mmst.c
@@ -146,7 +146,7 @@ static int send_command_packet(MMSTContext *mmst)
exact_length, write_result,
write_result < 0 ? strerror(write_result) :
"The server closed the connection");
- return AVERROR_IO;
+ return AVERROR(EIO);
}
return 0;
@@ -268,7 +268,7 @@ static MMSSCPacketType get_tcp_server_response(MMSTContext *mmst)
read_result,
read_result < 0 ? strerror(read_result) :
"The server closed the connection");
- return read_result < 0 ? read_result : AVERROR_IO;
+ return read_result < 0 ? read_result : AVERROR(EIO);
}
length_remaining= AV_RL32(mms->in_buffer+8) + 4;
@@ -289,13 +289,13 @@ static MMSSCPacketType get_tcp_server_response(MMSTContext *mmst)
length_remaining, read_result,
read_result < 0 ? strerror(read_result) :
"The server closed the connection");
- return read_result < 0 ? read_result : AVERROR_IO;
+ return read_result < 0 ? read_result : AVERROR(EIO);
}
packet_type= AV_RL16(mms->in_buffer+36);
if (read_result >= 44 && (hr = AV_RL32(mms->in_buffer + 40))) {
av_log(NULL, AV_LOG_ERROR,
"Server sent a message with packet type 0x%x and error status code 0x%08x\n", packet_type, hr);
- return AVERROR_UNKNOWN;
+ return AVERROR(EINVAL);
}
} else {
int length_remaining;
@@ -326,7 +326,7 @@ static MMSSCPacketType get_tcp_server_response(MMSTContext *mmst)
length_remaining, read_result,
read_result < 0 ? strerror(read_result) :
"The server closed the connection");
- return read_result < 0 ? read_result : AVERROR_IO;
+ return read_result < 0 ? read_result : AVERROR(EIO);
}
// if we successfully read everything.
@@ -550,7 +550,7 @@ static int mms_open(URLContext *h, const char *uri, int flags)
if((mmst->incoming_flags != 0X08) && (mmst->incoming_flags != 0X0C)) {
av_log(NULL, AV_LOG_ERROR,
"The server does not support MMST (try MMSH or RTSP)\n");
- err = AVERROR_NOFMT;
+ err = AVERROR(EINVAL);
goto fail;
}
err = ff_mms_asf_header_parser(mms);
@@ -604,7 +604,7 @@ static int mms_read(URLContext *h, uint8_t *buf, int size)
av_log(NULL, AV_LOG_ERROR,
"Incoming pktlen %d is larger than ASF pktsize %d\n",
mms->remaining_in_len, mms->asf_packet_len);
- result= AVERROR_IO;
+ result= AVERROR(EIO);
} else {
// copy the data to the packet buffer.
result = ff_mms_read_data(mms, buf, size);
diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c
index 206ed347b49cc38b1a78c6ef507798f3953efdde..7df11b3d93e2384a8d0907b466992e5e8d14185b 100644
--- a/libavformat/rtpdec_qt.c
+++ b/libavformat/rtpdec_qt.c
@@ -98,7 +98,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
if (!is_start || !is_finish) {
av_log_missing_feature(s, "RTP-X-QT with payload description "
"split over several packets", 1);
- return AVERROR_NOTSUPP;
+ return AVERROR(ENOSYS);
}
skip_bits(&gb, 12); // reserved
data_len = get_bits(&gb, 16);
@@ -161,7 +161,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
if (has_packet_info) {
av_log_missing_feature(s, "RTP-X-QT with packet specific info", 1);
- return AVERROR_NOTSUPP;
+ return AVERROR(ENOSYS);
}
alen = len - avio_tell(&pb);
@@ -224,7 +224,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
default: /* unimplemented */
av_log_missing_feature(NULL, "RTP-X-QT with packing scheme 2", 1);
- return AVERROR_NOTSUPP;
+ return AVERROR(ENOSYS);
}
}
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 6e7fedc049653310802288b9784b212f53c986f5..0ea209c93c70d58728105672711a975ff8926b64 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -389,6 +389,8 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score
score = 0;
if (fmt1->read_probe) {
score = fmt1->read_probe(&lpd);
+ if(!score && fmt1->extensions && av_match_ext(lpd.filename, fmt1->extensions))
+ score = 1;
} else if (fmt1->extensions) {
if (av_match_ext(lpd.filename, fmt1->extensions)) {
score = 50;
diff --git a/libavformat/wtv.c b/libavformat/wtv.c
index a9ad2718ad38bad2dcf5be39aa0c9b6a22040621..110366fc1a3727b30d4c1d0fb580ad6ebf2fa342 100644
--- a/libavformat/wtv.c
+++ b/libavformat/wtv.c
@@ -1061,7 +1061,7 @@ static int read_seek(AVFormatContext *s, int stream_index,
int i;
if ((flags & AVSEEK_FLAG_FRAME) || (flags & AVSEEK_FLAG_BYTE))
- return AVERROR_NOTSUPP;
+ return AVERROR(ENOSYS);
/* timestamp adjustment is required because wtv->pts values are absolute,
* whereas AVIndexEntry->timestamp values are relative to epoch. */
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index 563d85ce80a0229790f21905f2e6b67984445bbd..aa12e08ae4211e9e24e0c1215fc358d31d2aea67 100644
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -48,7 +48,7 @@
* They may change, break or disappear at any time.
*/
#ifndef FF_API_SWS_GETCONTEXT
-#define FF_API_SWS_GETCONTEXT (LIBSWSCALE_VERSION_MAJOR < 1)
+#define FF_API_SWS_GETCONTEXT (LIBSWSCALE_VERSION_MAJOR < 2)
#endif
/**
@@ -185,9 +185,9 @@ void sws_freeContext(struct SwsContext *swsContext);
* @param dstFormat the destination image format
* @param flags specify which algorithm and options to use for rescaling
* @return a pointer to an allocated context, or NULL in case of error
- * @deprecated use sws_alloc_context() and sws_init_context()
+ * @note this function is to be removed after a saner alternative is
+ * written
*/
-attribute_deprecated
struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat,
int dstW, int dstH, enum PixelFormat dstFormat,
int flags, SwsFilter *srcFilter,
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak
index 05835f8fb9c9118031ca5fbd3ace53e0f3926add..41df4f619ff7b3ccc9658f7085b2e864cdfc735e 100644
--- a/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@ -18,6 +18,10 @@ FATE_AAC += fate-aac-al_sbr_ps_06_ur
fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(SAMPLES)/aac/al_sbr_ps_06_new.mp4
fate-aac-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16
+FATE_AAC += fate-aac-latm_000000001180bc60
+fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg
+fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16
+
FATE_TESTS += $(FATE_AAC)
fate-aac: $(FATE_AAC)
$(FATE_AAC): CMP = oneoff