Originally committed as revision 16172 to svn://svn.ffmpeg.org/ffmpeg/trunk
MpegEncContext * const s = &h->s;
const int mb_xy= h->mb_xy;
const int mb_type= s->current_picture.mb_type[mb_xy];
- int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 ||
- (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding) || ENABLE_SMALL ||
- s->qscale == 0;
+ int is_complex = h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
if(ENABLE_H264_ENCODER && !s->decode)
return;
s->mb_skip_run= -1;
+ h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 ||
+ (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding) || ENABLE_SMALL;
+
if( h->pps.cabac ) {
int i;
* pic_struct in picture timing SEI message
*/
SEI_PicStructType sei_pic_struct;
+
+ int is_complex;
}H264Context;
#endif /* AVCODEC_H264_H */