[FFmpeg-cvslog] r20975 - in trunk/libavcodec: dsputil.c h263.h mpegvideo_enc.c x86/dsputil_mmx.c

[diego]

Author: diego
Date: Wed Dec 30 12:33:59 2009
New Revision: 20975

Log:
Get rid of pointless CONFIG_ANY_H263 preprocessor definition.

Deleted:
   trunk/libavcodec/h263.h
Modified:
   trunk/libavcodec/dsputil.c
   trunk/libavcodec/mpegvideo_enc.c
   trunk/libavcodec/x86/dsputil_mmx.c

Modified: trunk/libavcodec/dsputil.c
==============================================================================
--- trunk/libavcodec/dsputil.c	Wed Dec 30 12:22:41 2009	(r20974)
+++ trunk/libavcodec/dsputil.c	Wed Dec 30 12:33:59 2009	(r20975)
@@ -33,7 +33,6 @@
 #include "faandct.h"
 #include "faanidct.h"
 #include "mathops.h"
-#include "h263.h"
 #include "snow.h"
 #include "mpegvideo.h"
 #include "config.h"
@@ -2876,7 +2875,7 @@ static void put_mspel8_mc22_c(uint8_t *d
 }
 
 static void h263_v_loop_filter_c(uint8_t *src, int stride, int qscale){
-    if(CONFIG_ANY_H263) {
+    if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
     int x;
     const int strength= ff_h263_loop_filter_strength[qscale];
 
@@ -2913,7 +2912,7 @@ static void h263_v_loop_filter_c(uint8_t
 }
 
 static void h263_h_loop_filter_c(uint8_t *src, int stride, int qscale){
-    if(CONFIG_ANY_H263) {
+    if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
     int y;
     const int strength= ff_h263_loop_filter_strength[qscale];
 
@@ -4807,7 +4806,7 @@ void dsputil_init(DSPContext* c, AVCodec
     c->h264_h_loop_filter_chroma_intra= h264_h_loop_filter_chroma_intra_c;
     c->h264_loop_filter_strength= NULL;
 
-    if (CONFIG_ANY_H263) {
+    if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
         c->h263_h_loop_filter= h263_h_loop_filter_c;
         c->h263_v_loop_filter= h263_v_loop_filter_c;
     }

Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c	Wed Dec 30 12:22:41 2009	(r20974)
+++ trunk/libavcodec/mpegvideo_enc.c	Wed Dec 30 12:33:59 2009	(r20975)
@@ -33,7 +33,6 @@
 #include "mpegvideo_common.h"
 #include "mjpegenc.h"
 #include "msmpeg4.h"
-#include "h263.h"
 #include "faandct.h"
 #include "aandcttab.h"
 #include <limits.h>

Modified: trunk/libavcodec/x86/dsputil_mmx.c
==============================================================================
--- trunk/libavcodec/x86/dsputil_mmx.c	Wed Dec 30 12:22:41 2009	(r20974)
+++ trunk/libavcodec/x86/dsputil_mmx.c	Wed Dec 30 12:33:59 2009	(r20975)
@@ -24,7 +24,6 @@
 
 #include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
-#include "libavcodec/h263.h"
 #include "libavcodec/mpegvideo.h"
 #include "libavcodec/simple_idct.h"
 #include "dsputil_mmx.h"
@@ -703,7 +702,7 @@ static void add_hfyu_median_prediction_c
         "paddb %%mm1, %%mm6             \n\t"
 
 static void h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale){
-    if(CONFIG_ANY_H263) {
+    if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
     const int strength= ff_h263_loop_filter_strength[qscale];
 
     __asm__ volatile(
@@ -753,7 +752,7 @@ static inline void transpose4x4(uint8_t 
 }
 
 static void h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale){
-    if(CONFIG_ANY_H263) {
+    if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
     const int strength= ff_h263_loop_filter_strength[qscale];
     DECLARE_ALIGNED(8, uint64_t, temp[4]);
     uint8_t *btemp= (uint8_t*)temp;
@@ -2624,7 +2623,7 @@ void dsputil_init_mmx(DSPContext* c, AVC
 
         c->draw_edges = draw_edges_mmx;
 
-        if (CONFIG_ANY_H263) {
+        if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
             c->h263_v_loop_filter= h263_v_loop_filter_mmx;
             c->h263_h_loop_filter= h263_h_loop_filter_mmx;
         }