diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2007-10-09 12:28:17 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2007-10-09 12:28:17 +0000 |
| commit | d6c52130f75579885a0952fc07633a3955802330 (patch) | |
| tree | 00b1b2c61bb73d337f8751c353a59bc9fdddf871 | |
| parent | bcf8eb116a270ebdc9e56124210835508ab959a8 (diff) | |
| download | ffmpeg-d6c52130f75579885a0952fc07633a3955802330.tar.gz | |
Enable PAFF decoding
Originally committed as revision 10696 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | libavcodec/h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264.h | 2 |
3 files changed, 2 insertions, 2 deletions
@@ -98,6 +98,7 @@ version <next> - additional SPARC (VIS) optimizations - AMV audio and video decoder - DNxHD encoder +- H.264 PAFF decoding version 0.4.9-pre1: diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 752f2d236f..6f5d37ac31 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 43c356760f..d85fcb7674 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 |