aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-22 01:08:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-22 01:08:28 +0100
commitdedbefee60430e04551977553838e89dad4ff932 (patch)
treeb3e8f39ade076809a59ef7568a375731045ba4f3
parentfee2cc39becb1930461dff267389717337804a4a (diff)
parent5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a (diff)
downloadffmpeg-dedbefee60430e04551977553838e89dad4ff932.tar.gz
Merge commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a'
* commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a': mpegaudio_parser: add MP3 ADU headers parser Conflicts: libavcodec/mpegaudio_parser.c libavcodec/mpegaudiodecheader.c libavcodec/version.h See: 8ca098f4445cd12d39b2c55b0dfb8c988b7b28ce Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mpegaudio_parser.c4
-rw-r--r--libavcodec/version.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c
index 42f470685a..58098d89f0 100644
--- a/libavcodec/mpegaudio_parser.c
+++ b/libavcodec/mpegaudio_parser.c
@@ -95,8 +95,8 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
s->frame_size = 0;
next = buf_size;
} else if (codec_id == AV_CODEC_ID_MP3ADU) {
- av_log(avctx, AV_LOG_ERROR,
- "MP3ADU full parser not implemented");
+ avpriv_report_missing_feature(avctx,
+ "MP3ADU full parser");
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/version.h b/libavcodec/version.h
index c0e6aa5907..63b64147d8 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MINOR 25
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \