diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-10-01 21:14:46 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-10-01 21:14:46 +0000 |
| commit | ff0d5a745e92218d3197d7f233d840d3ad0d6042 (patch) | |
| tree | 74579c3e8726fc252f2d38c86b488aa2712df136 /libavformat/matroskadec.c | |
| parent | 038146e9cfac37941541d788e769a32f9d94e14a (diff) | |
matroskadec: don't overwrite extradata already read by ff_get_wav_header()
Originally committed as revision 20132 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 1dc2d22ad9..bf69fc228b 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1351,6 +1351,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) av_reduce(&st->codec->time_base.num, &st->codec->time_base.den, track->default_duration, 1000000000, 30000); + if (!st->codec->extradata) { if(extradata){ st->codec->extradata = extradata; st->codec->extradata_size = extradata_size; @@ -1364,6 +1365,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) track->codec_priv.data + extradata_offset, track->codec_priv.size); } + } if (track->type == MATROSKA_TRACK_TYPE_VIDEO) { st->codec->codec_type = CODEC_TYPE_VIDEO; |