From d1ac03517e66ff12564c4d5abcb204e9a4e424b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <tomas.hardin@codemill.se>
Date: Mon, 27 Sep 2010 12:27:23 +0000
Subject: mpegtsenc: Write subtitle extradata if set

Originally committed as revision 25221 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/mpegtsenc.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libavformat/mpegtsenc.c')

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index ac09ab93d5..94a051d96f 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:
-- 
cgit v1.2.3