Merge commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a'

* commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a': mpegaudio_parser: add MP3 ADU headers parser Conflicts: libavcodec/mpegaudio_parser.c libavcodec/mpegaudiodecheader.c libavcodec/version.h See: 8ca098f444 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · dedbefee60
parent fee2cc39be 5cbae5651d
commit dedbefee60
2 changed files with 3 additions and 3 deletions
--- 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;
                    }

--- 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, \