Mercurial > libavcodec.hg

changeset 5801:0be16259b7d8 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable PAFF decoding
author cehoyos
date Tue, 09 Oct 2007 12:28:17 +0000
parents 9c4c865e9974
children d112d5c13ae8
files h264.c h264.h
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Tue Oct 09 05:39:49 2007 +0000
+++ b/h264.c	Tue Oct 09 12:28:17 2007 +0000
@@ -3989,7 +3989,6 @@
     }else{
         if(get_bits1(&s->gb)) { //field_pic_flag
             s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
-            av_log(h->s.avctx, AV_LOG_ERROR, "PAFF interlacing is not implemented\n");
         } else {
             s->picture_structure= PICT_FRAME;
             h->mb_aff_frame = h->sps.mb_aff;
--- a/h264.h	Tue Oct 09 05:39:49 2007 +0000
+++ b/h264.h	Tue Oct 09 12:28:17 2007 +0000
@@ -59,7 +59,7 @@
 #define MB_MBAFF h->mb_mbaff
 #define MB_FIELD h->mb_field_decoding_flag
 #define FRAME_MBAFF h->mb_aff_frame
-#define FIELD_PICTURE 0
+#define FIELD_PICTURE (s->picture_structure != PICT_FRAME)
 #else
 #define MB_MBAFF 0
 #define MB_FIELD 0