aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodger Combs <rodger.combs@gmail.com>2015-08-16 03:06:04 -0500
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-10-09 21:36:40 +0200
commit6197d35a93bf959527d52efe28f9dd692b0a035f (patch)
tree1a9d988f8f0f024f7d8e093b6ba0a33c0c33cd7a
parent8f00ff5ae03d22d8a73f357a3f1c08f403a40ba2 (diff)
downloadffmpeg-6197d35a93bf959527d52efe28f9dd692b0a035f.tar.gz
lavf/matroskadec: Fully parse and repack MP3 packets
Fixes https://trac.ffmpeg.org/ticket/4776 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b4b2717ffe89940999eeca7317190f729b27f472)
-rw-r--r--libavformat/matroskadec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index ca43c28c6b..206d798db6 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2053,7 +2053,9 @@ static int matroska_parse_tracks(AVFormatContext *s)
st->codec->channels = track->audio.channels;
if (!st->codec->bits_per_coded_sample)
st->codec->bits_per_coded_sample = track->audio.bitdepth;
- if (st->codec->codec_id != AV_CODEC_ID_AAC)
+ if (st->codec->codec_id == AV_CODEC_ID_MP3)
+ st->need_parsing = AVSTREAM_PARSE_FULL;
+ else if (st->codec->codec_id != AV_CODEC_ID_AAC)
st->need_parsing = AVSTREAM_PARSE_HEADERS;
if (track->codec_delay > 0) {
st->codec->delay = av_rescale_q(track->codec_delay,