diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-14 20:19:17 +0300 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-14 20:19:17 +0300 |
commit | 49fb20cb8a5da4250c978bd8cea8bd841dc0594f (patch) | |
tree | 142746aa8ae9cf412da3a61ac287c4d9deb7ca22 /libavcodec/h263dec.c | |
parent | 7356aaa78626b34c3b2779c7af84c92111025ebf (diff) |
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
and remove all ENABLE_ definitions.
Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r-- | libavcodec/h263dec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index dda05668aa..557124e172 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -111,7 +111,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) if (MPV_common_init(s) < 0) return -1; - if (ENABLE_MSMPEG4_DECODER && s->h263_msmpeg4) + if (CONFIG_MSMPEG4_DECODER && s->h263_msmpeg4) ff_msmpeg4_decode_init(s); else h263_decode_init_vlc(s); @@ -355,9 +355,9 @@ uint64_t time= rdtsc(); if(s->flags&CODEC_FLAG_TRUNCATED){ int next; - if(ENABLE_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4){ + if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4){ next= ff_mpeg4_find_frame_end(&s->parse_context, buf, buf_size); - }else if(ENABLE_H263_DECODER && s->codec_id==CODEC_ID_H263){ + }else if(CONFIG_H263_DECODER && s->codec_id==CODEC_ID_H263){ next= ff_h263_find_frame_end(&s->parse_context, buf, buf_size); }else{ av_log(s->avctx, AV_LOG_ERROR, "this codec does not support truncated bitstreams\n"); @@ -390,9 +390,9 @@ retry: } /* let's go :-) */ - if (ENABLE_WMV2_DECODER && s->msmpeg4_version==5) { + if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5) { ret= ff_wmv2_decode_picture_header(s); - } else if (ENABLE_MSMPEG4_DECODER && s->msmpeg4_version) { + } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) { ret = msmpeg4_decode_picture_header(s); } else if (s->h263_pred) { if(s->avctx->extradata_size && s->picture_number==0){ @@ -620,7 +620,7 @@ retry: //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type //which is not available before MPV_frame_start() - if (ENABLE_WMV2_DECODER && s->msmpeg4_version==5){ + if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5){ ret = ff_wmv2_decode_secondary_picture_header(s); if(ret<0) return ret; if(ret==1) goto intrax8_decoded; @@ -647,7 +647,7 @@ retry: } if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==FF_I_TYPE) - if(!ENABLE_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){ + if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){ s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; } |