mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Enable PAFF decoding
Originally committed as revision 10696 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
bcf8eb116a
commit
d6c52130f7
@ -98,6 +98,7 @@ version <next>
|
|||||||
- additional SPARC (VIS) optimizations
|
- additional SPARC (VIS) optimizations
|
||||||
- AMV audio and video decoder
|
- AMV audio and video decoder
|
||||||
- DNxHD encoder
|
- DNxHD encoder
|
||||||
|
- H.264 PAFF decoding
|
||||||
|
|
||||||
version 0.4.9-pre1:
|
version 0.4.9-pre1:
|
||||||
|
|
||||||
|
@ -3989,7 +3989,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
|
|||||||
}else{
|
}else{
|
||||||
if(get_bits1(&s->gb)) { //field_pic_flag
|
if(get_bits1(&s->gb)) { //field_pic_flag
|
||||||
s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_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 {
|
} else {
|
||||||
s->picture_structure= PICT_FRAME;
|
s->picture_structure= PICT_FRAME;
|
||||||
h->mb_aff_frame = h->sps.mb_aff;
|
h->mb_aff_frame = h->sps.mb_aff;
|
||||||
|
@ -59,7 +59,7 @@
|
|||||||
#define MB_MBAFF h->mb_mbaff
|
#define MB_MBAFF h->mb_mbaff
|
||||||
#define MB_FIELD h->mb_field_decoding_flag
|
#define MB_FIELD h->mb_field_decoding_flag
|
||||||
#define FRAME_MBAFF h->mb_aff_frame
|
#define FRAME_MBAFF h->mb_aff_frame
|
||||||
#define FIELD_PICTURE 0
|
#define FIELD_PICTURE (s->picture_structure != PICT_FRAME)
|
||||||
#else
|
#else
|
||||||
#define MB_MBAFF 0
|
#define MB_MBAFF 0
|
||||||
#define MB_FIELD 0
|
#define MB_FIELD 0
|
||||||
|
Loading…
Reference in New Issue
Block a user