diff options
| author | Dale Curtis <dalecurtis@chromium.org> | 2018-01-29 15:10:26 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-01-30 05:28:22 +0100 |
| commit | 42323c3e3a600288e4bf1cefe952486ffc29d280 (patch) | |
| tree | 2ea3f3befd3801e521aee9217644b56fcc5b2c20 | |
| parent | b99e77b9f7b9df53aa59f9cc4b41572453a55513 (diff) | |
| download | ffmpeg-42323c3e3a600288e4bf1cefe952486ffc29d280.tar.gz | |
avcodec/mpegaudio_parser: Skip APE tags when parsing mp3 packets.
Otherwise the decoder will throw "Missing header" errors when the
packets are sent for decoding.
This is similar to 89a420b71b5.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mpegaudio_parser.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c index 8c39825792..244281b56f 100644 --- a/libavcodec/mpegaudio_parser.c +++ b/libavcodec/mpegaudio_parser.c @@ -23,6 +23,7 @@ #include "parser.h" #include "mpegaudiodecheader.h" #include "libavutil/common.h" +#include "libavformat/apetag.h" // for APE tag. #include "libavformat/id3v1.h" // for ID3v1_TAG_SIZE typedef struct MpegAudioParseContext { @@ -120,6 +121,12 @@ static int mpegaudio_parse(AVCodecParserContext *s1, return next; } + if (flush && buf_size >= APE_TAG_FOOTER_BYTES && memcmp(buf, APE_TAG_PREAMBLE, 8) == 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return next; + } + *poutbuf = buf; *poutbuf_size = buf_size; return next; |