RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove CONFIG_H264_ENCODER references 

Originally committed as revision 16996 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2009-02-04 21:28:58 +00:00
parent 993f2d0fd7
commit 5317c95b75
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264.c
View File

@ -2679,9 +2679,6 @@ static void hl_decode_mb(H264Context *h){
const int mb_type= s->current_picture.mb_type[mb_xy]; const int mb_type= s->current_picture.mb_type[mb_xy];
int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0; int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
if(CONFIG_H264_ENCODER && !s->decode)
return;
if (is_complex) if (is_complex)
hl_decode_mb_complex(h); hl_decode_mb_complex(h);
else hl_decode_mb_simple(h); else hl_decode_mb_simple(h);
@ -6605,7 +6602,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){
s->mb_skip_run= -1; s->mb_skip_run= -1;
h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 || h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 ||
(CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (CONFIG_H264_ENCODER && s->encoding); (CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY));
if( h->pps.cabac ) { if( h->pps.cabac ) {
int i; int i;