Originally committed as revision 10696 to svn://svn.ffmpeg.org/ffmpeg/trunk
Carl Eugen Hoyos authored on 2007/10/09 21:28:17... | ... |
@@ -3989,7 +3989,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ |
3989 | 3989 |
}else{ |
3990 | 3990 |
if(get_bits1(&s->gb)) { //field_pic_flag |
3991 | 3991 |
s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag |
3992 |
- av_log(h->s.avctx, AV_LOG_ERROR, "PAFF interlacing is not implemented\n"); |
|
3993 | 3992 |
} else { |
3994 | 3993 |
s->picture_structure= PICT_FRAME; |
3995 | 3994 |
h->mb_aff_frame = h->sps.mb_aff; |
... | ... |
@@ -59,7 +59,7 @@ |
59 | 59 |
#define MB_MBAFF h->mb_mbaff |
60 | 60 |
#define MB_FIELD h->mb_field_decoding_flag |
61 | 61 |
#define FRAME_MBAFF h->mb_aff_frame |
62 |
-#define FIELD_PICTURE 0 |
|
62 |
+#define FIELD_PICTURE (s->picture_structure != PICT_FRAME) |
|
63 | 63 |
#else |
64 | 64 |
#define MB_MBAFF 0 |
65 | 65 |
#define MB_FIELD 0 |