[SCM] libav/experimental: mpegtsenc: Write subtitle extradata if set

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d1ac03517e66ff12564c4d5abcb204e9a4e424b6
Author: Tomas Härdin <tomas.hardin at codemill.se>
Date:   Mon Sep 27 12:27:23 2010 +0000

    mpegtsenc: Write subtitle extradata if set
    
    Originally committed as revision 25221 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index ac09ab9..94a051d 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -276,8 +276,13 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
                 *q++ = language[1];
                 *q++ = language[2];
                 *q++ = 0x10; /* normal subtitles (0x20 = if hearing pb) */
+                if(st->codec->extradata_size == 4) {
+                    memcpy(q, st->codec->extradata, 4);
+                    q += 4;
+                } else {
                 put16(&q, 1); /* page id */
                 put16(&q, 1); /* ancillary page id */
+                }
             }
             break;
         case AVMEDIA_TYPE_VIDEO:

-- 
Libav/FFmpeg packaging