diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-02-04 21:28:58 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-02-04 21:28:58 +0000 |
| commit | 5317c95b7539bdcc4988dcd7b402ebcb724d4792 (patch) | |
| tree | 8e0f6f0a37da9e612f861d1b84c39a5fae57ca1d /libavcodec/h264.c | |
| parent | 993f2d0fd776504b8a20bb3714d79b89e19a5ca4 (diff) | |
Remove CONFIG_H264_ENCODER references
Originally committed as revision 16996 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 0e81f13fd0..be0abd45a3 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2679,9 +2679,6 @@ static void hl_decode_mb(H264Context *h){ 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 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){ 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; |