[FFmpeg-cvslog] r25221 - trunk/libavformat/mpegtsenc.c

[thardin]

Author: thardin
Date: Mon Sep 27 14:27:23 2010
New Revision: 25221

Log:
mpegtsenc: Write subtitle extradata if set

Modified:
   trunk/libavformat/mpegtsenc.c

Modified: trunk/libavformat/mpegtsenc.c
==============================================================================
--- trunk/libavformat/mpegtsenc.c	Mon Sep 27 12:34:03 2010	(r25220)
+++ trunk/libavformat/mpegtsenc.c	Mon Sep 27 14:27:23 2010	(r25221)
@@ -276,8 +276,13 @@ static void mpegts_write_pmt(AVFormatCon
                 *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: