[SCM] libav/experimental: Only write extradata if it exists

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8bea4aee4fc8d2169b8bebc3dd49dc8e989ba936
Author: David Conrad <lessen42 at gmail.com>
Date:   Wed Sep 5 00:23:46 2007 +0000

    Only write extradata if it exists
    
    Originally committed as revision 10328 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index fe419b2..0f59fc3 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -420,7 +420,7 @@ static int mkv_write_tracks(AVFormatContext *s)
             if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) {
                 if (put_xiph_codecpriv(pb, codec) < 0)
                     return -1;
-            } else {
+            } else if (codec->extradata_size) {
                 put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codec->extradata, codec->extradata_size);
             }
         }

-- 
Libav/FFmpeg packaging