Mercurial > libavcodec.hg

changeset 10745:a47f207fe4b5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of pointless CONFIG_WMV2 definition.
author diego
date Wed, 30 Dec 2009 02:08:25 +0000
parents 3e99ff77e0b7
children c4898c0739be
files mpegvideo.c mpegvideo_common.h msmpeg4.h
diffstat 3 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mpegvideo.c	Wed Dec 30 02:01:19 2009 +0000
+++ b/mpegvideo.c	Wed Dec 30 02:08:25 2009 +0000
@@ -1966,7 +1966,7 @@
                     }
                 }//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 {
--- a/mpegvideo_common.h	Wed Dec 30 02:01:19 2009 +0000
+++ b/mpegvideo_common.h	Wed Dec 30 02:08:25 2009 +0000
@@ -727,7 +727,7 @@
                         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);
--- a/msmpeg4.h	Wed Dec 30 02:01:19 2009 +0000
+++ b/msmpeg4.h	Wed Dec 30 02:08:25 2009 +0000
@@ -58,7 +58,6 @@
                                 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 */