Commit d6c52130 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Enable PAFF decoding

Originally committed as revision 10696 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent bcf8eb11
......@@ -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:
......
......@@ -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;
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment