Mercurial > libavcodec.hg

changeset 8742:ecabe55b66bb libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove CONFIG_H264_ENCODER references
author mru
date Wed, 04 Feb 2009 21:28:58 +0000
parents 0975a4c09974
children 92f032e1f9e1
files h264.c
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;