[FFmpeg-devel] [PATCH]Fix building with --disable-everything

Carl Eugen Hoyos cehoyos at ag.or.at
Sat Feb 9 12:22:22 CET 2013


Hi!

Attached patch fixes ticket #2253 for me.

Please review, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f08c83c..a1169b7 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -23,6 +23,7 @@ OBJS = allcodecs.o                                                      \
        dsputil.o                                                        \
        faanidct.o                                                       \
        fmtconvert.o                                                     \
+       h263data.o                                                       \
        imgconvert.o                                                     \
        jrevdct.o                                                        \
        log2_tab.o                                                       \
diff --git a/libavcodec/h263data.c b/libavcodec/h263data.c
index e69de29..57c3dbe 100644
--- a/libavcodec/h263data.c
+++ b/libavcodec/h263data.c
@@ -0,0 +1,27 @@
+/*
+ * H263+ support
+ * copyright (c) 2003 Michael Niedermayer <michaelni at gmx.at>
+ *
+ * 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
+ */
+
+#include "mpegvideo.h"
+
+const uint8_t ff_h263_loop_filter_strength[32]={
+//  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
+    0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12
+};
diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h
index e245e2f..1cd965f 100644
--- a/libavcodec/h263data.h
+++ b/libavcodec/h263data.h
@@ -272,11 +272,6 @@ const uint8_t ff_mba_length[7]={
       6,   7,   9,  11,  13,  14,  14
 };
 
-const uint8_t ff_h263_loop_filter_strength[32]={
-//  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
-    0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12
-};
-
 const AVRational ff_h263_pixel_aspect[16]={
  {0, 1},
  {1, 1},
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 30264d7..d2b2d0d 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -62,8 +62,7 @@ YASM-OBJS-$(CONFIG_H264DSP)            += x86/h264_deblock.o            \
                                           x86/h264_weight_10bit.o
 YASM-OBJS-$(CONFIG_H264PRED)           += x86/h264_intrapred.o          \
                                           x86/h264_intrapred_10bit.o
-YASM-OBJS-$(CONFIG_H264QPEL)           += x86/h264_qpel_8bit.o          \
-                                          x86/h264_qpel_10bit.o
+YASM-OBJS-$(CONFIG_H264QPEL)           += x86/h264_qpel_10bit.o
 YASM-OBJS-$(CONFIG_MPEGAUDIODSP)       += x86/imdct36.o
 YASM-OBJS-$(CONFIG_PNG_DECODER)        += x86/pngdsp.o
 YASM-OBJS-$(CONFIG_PRORES_DECODER)     += x86/proresdsp.o
@@ -82,5 +81,6 @@ YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/vp8dsp.o
 YASM-OBJS                              += x86/dsputil.o                 \
                                           x86/deinterlace.o             \
                                           x86/fmtconvert.o              \
+                                          x86/h264_qpel_8bit.o          \
                                           x86/hpeldsp.o                 \
                                           x86/mpeg4qpel.o               \


More information about the ffmpeg-devel mailing list