[SCM] libav/experimental: Set default subtitle_codec to CODEC_ID_TEXT

[siretart at users.alioth.debian.org]

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

    Set default subtitle_codec to CODEC_ID_TEXT
    
    Originally committed as revision 10355 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 35ed262..76369ba 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -740,6 +740,7 @@ AVOutputFormat matroska_muxer = {
     mkv_write_packet,
     mkv_write_trailer,
     .codec_tag = (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, 0},
+    .subtitle_codec = CODEC_ID_TEXT,
 };
 
 AVOutputFormat matroska_audio_muxer = {

-- 
Libav/FFmpeg packaging