# HG changeset patch # User mru # Date 1233782938 0 # Node ID ecabe55b66bb833ff132042cd59267d2a679a87e # Parent 0975a4c09974c7db647ba1d11646db003ae2d36c Remove CONFIG_H264_ENCODER references diff -r 0975a4c09974 -r ecabe55b66bb h264.c --- a/h264.c Wed Feb 04 20:43:17 2009 +0000 +++ b/h264.c Wed Feb 04 21:28:58 2009 +0000 @@ -2679,9 +2679,6 @@ 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; - if(CONFIG_H264_ENCODER && !s->decode) - return; - if (is_complex) hl_decode_mb_complex(h); else hl_decode_mb_simple(h); @@ -6605,7 +6602,7 @@ s->mb_skip_run= -1; 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 ) { int i;