[FFmpeg-cvslog] r20132 - trunk/libavformat/matroskadec.c

[aurel]

Author: aurel
Date: Thu Oct  1 23:14:46 2009
New Revision: 20132

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

Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	Thu Oct  1 23:14:05 2009	(r20131)
+++ trunk/libavformat/matroskadec.c	Thu Oct  1 23:14:46 2009	(r20132)
@@ -1351,6 +1351,7 @@ static int matroska_read_header(AVFormat
             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(AVFormat
                    track->codec_priv.data + extradata_offset,
                    track->codec_priv.size);
         }
+        }
 
         if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
             st->codec->codec_type = CODEC_TYPE_VIDEO;