generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskadec: don't overwrite extradata already read by ff_get_wav_header()

Browse Source 
Originally committed as revision 20132 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2009-10-01 21:14:46 +00:00
parent 038146e9cf
commit ff0d5a745e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/matroskadec.c
View File

@ -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, av_reduce(&st->codec->time_base.num, &st->codec->time_base.den,
track->default_duration, 1000000000, 30000); track->default_duration, 1000000000, 30000);
if (!st->codec->extradata) {
if(extradata){ if(extradata){
st->codec->extradata = extradata; st->codec->extradata = extradata;
st->codec->extradata_size = extradata_size; 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.data + extradata_offset,
track->codec_priv.size); track->codec_priv.size);
} }
}
if (track->type == MATROSKA_TRACK_TYPE_VIDEO) { if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;