[SCM] libav/experimental: matroskadec: don't overwrite extradata already read by ff_get_wav_header()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ff0d5a745e92218d3197d7f233d840d3ad0d6042
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Thu Oct 1 21:14:46 2009 +0000

    matroskadec: don't overwrite extradata already read by ff_get_wav_header()
    
    Originally committed as revision 20132 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 1dc2d22..bf69fc2 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;

-- 
Libav/FFmpeg packaging