diff options
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/h264.c | 1 | ||||
-rw-r--r-- | libavcodec/h264.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 752f2d2..6f5d37a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3989,7 +3989,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ }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 --git a/libavcodec/h264.h b/libavcodec/h264.h index 43c3567..d85fcb7 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -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 |