# HG changeset patch # User cehoyos # Date 1191932897 0 # Node ID 0be16259b7d8db2dbcf3d87e920dc13dda0dfc61 # Parent 9c4c865e9974969a0de6cf2a77db2d2b027f1c90 Enable PAFF decoding diff -r 9c4c865e9974 -r 0be16259b7d8 h264.c --- 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; diff -r 9c4c865e9974 -r 0be16259b7d8 h264.h --- 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