aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-12-30 11:33:59 +0000
committerDiego Biurrun <diego@biurrun.de>2009-12-30 11:33:59 +0000
commit4052cbf161adce4635175206cdadc77e657d7903 (patch)
tree8faa6bf636437623ad622db7e86b918be18786a4
parentaf818f7a6612e70320f83c7ef0ddc9bfd035d18b (diff)
downloadffmpeg-4052cbf161adce4635175206cdadc77e657d7903.tar.gz
Get rid of pointless CONFIG_ANY_H263 preprocessor definition.
Originally committed as revision 20975 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/dsputil.c7
-rw-r--r--libavcodec/h263.h30
-rw-r--r--libavcodec/mpegvideo_enc.c1
-rw-r--r--libavcodec/x86/dsputil_mmx.c7
4 files changed, 6 insertions, 39 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index d3cd6430eb..9160ac308f 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -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;
}
diff --git a/libavcodec/h263.h b/libavcodec/h263.h
deleted file mode 100644
index 7a7b7c7901..0000000000
--- a/libavcodec/h263.h
+++ /dev/null
@@ -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 */
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index f63a7fbf71..4b1dc12846 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -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>
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 3a1588358d..b9d2ad7513 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -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;
}