[Ffmpeg-cvslog] r7849 - trunk/libavcodec/vc1.c

kostya subversion
Tue Feb 6 08:16:56 CET 2007


Author: kostya
Date: Tue Feb  6 08:16:52 2007
New Revision: 7849

Modified:
   trunk/libavcodec/vc1.c

Log:
Progressive frames disguised as interlaced are supported

Modified: trunk/libavcodec/vc1.c
==============================================================================
--- trunk/libavcodec/vc1.c	(original)
+++ trunk/libavcodec/vc1.c	Tue Feb  6 08:16:52 2007
@@ -1282,10 +1282,6 @@
     v->s.avctx->height = v->s.avctx->coded_height;
     v->broadcast = get_bits1(gb);
     v->interlace = get_bits1(gb);
-    if(v->interlace){
-        av_log(v->s.avctx, AV_LOG_ERROR, "Interlaced mode not supported (yet)\n");
-        return -1;
-    }
     v->tfcntrflag = get_bits1(gb);
     v->finterpflag = get_bits1(gb);
     get_bits1(gb); // reserved
@@ -1624,8 +1620,10 @@
 
     v->p_frame_skipped = 0;
 
-    if(v->interlace)
+    if(v->interlace){
         v->fcm = decode012(gb);
+        if(v->fcm) return -1; // interlaced frames/fields are not implemented
+    }
     switch(get_prefix(gb, 0, 4)) {
     case 0:
         v->s.pict_type = P_TYPE;




More information about the ffmpeg-cvslog mailing list