diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-12-30 02:08:25 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-12-30 02:08:25 +0000 |
| commit | d702a2e6c688fd6b99e2cb0fd3f32bb8b5307faa (patch) | |
| tree | eee389a0773c71ac2f7555d1f45c9ba92d94002e | |
| parent | b928b1bb011e5f8971eb0fc87400cdc6687af0b3 (diff) | |
| download | ffmpeg-d702a2e6c688fd6b99e2cb0fd3f32bb8b5307faa.tar.gz | |
Get rid of pointless CONFIG_WMV2 definition.
Originally committed as revision 20971 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_common.h | 2 | ||||
| -rw-r--r-- | libavcodec/msmpeg4.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 65f900eb9c..ea96cbe9f9 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1966,7 +1966,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], } }//fi gray } - else if (CONFIG_WMV2) { + else if (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) { ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); } } else { diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h index dc817fd600..b24b864bf7 100644 --- a/libavcodec/mpegvideo_common.h +++ b/libavcodec/mpegvideo_common.h @@ -727,7 +727,7 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s, 0, 0, 0, ref_picture, pix_op, qpix_op, s->mv[dir][0][0], s->mv[dir][0][1], 16); - }else if(!is_mpeg12 && CONFIG_WMV2 && s->mspel){ + }else if(!is_mpeg12 && (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) && s->mspel){ ff_mspel_motion(s, dest_y, dest_cb, dest_cr, ref_picture, pix_op, s->mv[dir][0][0], s->mv[dir][0][1], 16); diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index e09f29f597..c55aa1e918 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -58,7 +58,6 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); CONFIG_MSMPEG4V2_ENCODER || \ CONFIG_MSMPEG4V3_ENCODER || \ CONFIG_WMV2_ENCODER) -#define CONFIG_WMV2 (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) #define CONFIG_WMV_DECODER (CONFIG_WMV1_DECODER || CONFIG_WMV2_DECODER) #endif /* AVCODEC_MSMPEG4_H */ |