changeset 12562:83d91a7cba19

mpeg2 chroma422/444 support
author iive
date Fri, 11 Jun 2004 08:09:24 +0000
parents 2fa789d19851
children ad8852dcb3fe
files etc/codecs.conf libmpdemux/mpeg_hdr.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Thu Jun 10 23:39:08 2004 +0000
+++ b/etc/codecs.conf	Fri Jun 11 08:09:24 2004 +0000
@@ -50,6 +50,7 @@
   driver ffmpeg
   dll "mpeg2video"
   out YV12,I420,IYUV
+  out 422P,444P
 
 ; for backward compatibility
 videocodec ffmpeg12
@@ -63,6 +64,7 @@
   driver ffmpeg
   dll "mpegvideo"
   out YV12,I420,IYUV
+  out 422P,444P
 
 videocodec ffmpeg12mc
   info "FFmpeg MPEG 1/2 (XvMC)"
--- a/libmpdemux/mpeg_hdr.c	Thu Jun 10 23:39:08 2004 +0000
+++ b/libmpdemux/mpeg_hdr.c	Fri Jun 11 08:09:24 2004 +0000
@@ -58,8 +58,10 @@
 					      unsigned char * buffer)
 {
     /* check chroma format, size extensions, marker bit */
-    if (((buffer[1] & 0x07) != 0x02) || (buffer[2] & 0xe0) ||
-	((buffer[3] & 0x01) != 0x01))
+	    
+    if ( ((buffer[1] & 0x06) == 0x00) ||
+         ((buffer[1] & 0x01) != 0x00) || (buffer[2] & 0xe0) ||
+         ((buffer[3] & 0x01) != 0x01) )
 	return 1;
 
     picture->progressive_sequence = (buffer[1] >> 3) & 1;