[Ffmpeg-cvslog] CVS: ffmpeg/libavformat mpeg.c,1.85,1.86

[Fabrice Bellard]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv26154

Modified Files:
	mpeg.c 
Log Message:
DVD subtitle parsing - show mpeg component IDs by default

Index: mpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpeg.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- mpeg.c	20 May 2005 13:10:09 -0000	1.85
+++ mpeg.c	3 Jun 2005 14:01:49 -0000	1.86
@@ -1608,6 +1608,9 @@
     } else if (startcode >= 0xa0 && startcode <= 0xbf) {
         type = CODEC_TYPE_AUDIO;
         codec_id = CODEC_ID_PCM_S16BE;
+    } else if (startcode >= 0x20 && startcode <= 0x3f) {
+        type = CODEC_TYPE_SUBTITLE;
+        codec_id = CODEC_ID_DVD_SUBTITLE;
     } else {
     skip:
         /* skip packet */
@@ -1771,6 +1774,7 @@
     mpegps_read_close,
     NULL, //mpegps_read_seek,
     mpegps_read_dts,
+    .flags = AVFMT_SHOW_IDS,
 };
 
 int mpegps_init(void)