@@ -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 *dst, uint8_t *src, int stride){

 }

 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 *src, int stride, int qscale){

 }

 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, AVCodecContext *avctx)

     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;

     }

deleted file mode 100644

@@ -1,30 +0,0 @@

-/*

- * H263/MPEG4 backend for ffmpeg encoder and decoder

- * copyright (c) 2007 Aurelien Jacobs <aurel@gnuage.org>

- *

- * This file is part of FFmpeg.

- *

- * FFmpeg is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * FFmpeg is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with FFmpeg; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

- */

-

-#ifndef AVCODEC_H263_H

-#define AVCODEC_H263_H

-

-#include "config.h"

-#include "msmpeg4.h"

-

-#define CONFIG_ANY_H263 (CONFIG_H263_DECODER || CONFIG_H263_ENCODER)

-

-#endif /* AVCODEC_H263_H */

@@ -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>

@@ -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_cmov(uint8_t *dst, const uint8_t *top, co

         "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 *dst, uint8_t *src, int dst_stride, int

 }

 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, AVCodecContext *avctx)

         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;

         }