Browse Source

Enable PAFF decoding

Originally committed as revision 10696 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Carl Eugen Hoyos 18 years ago
parent
commit
d6c52130f7
3 changed files with 2 additions and 2 deletions
  1. +1
    -0
      Changelog
  2. +0
    -1
      libavcodec/h264.c
  3. +1
    -1
      libavcodec/h264.h

+ 1
- 0
Changelog View File

@@ -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:



+ 0
- 1
libavcodec/h264.c View File

@@ -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;


+ 1
- 1
libavcodec/h264.h View File

@@ -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


Loading…
Cancel
Save