Mercurial > libavcodec.hg

changeset 4487:0a0a9f0c9c2d libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Progressive frames disguised as interlaced are supported
author kostya
date Tue, 06 Feb 2007 07:16:52 +0000
parents 1d2320afa864
children 601865b7fc26
files vc1.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/vc1.c	Tue Feb 06 07:11:20 2007 +0000
+++ b/vc1.c	Tue Feb 06 07:16:52 2007 +0000
@@ -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;