diff options
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 466 |
1 files changed, 466 insertions, 0 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt new file mode 100644 index 000000000..8e7a13c7c --- /dev/null +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -0,0 +1,466 @@ +Only in ../../xine-lib/src/libffmpeg/libavcodec/: .deps +Only in ../../xine-lib/src/libffmpeg/libavcodec/: CVS +Only in .: Makefile +Only in ../../xine-lib/src/libffmpeg/libavcodec/: Makefile.am +Only in ../../xine-lib/src/libffmpeg/libavcodec/: Makefile.in +Only in .: ac3dec.c +Only in .: ac3enc.c +Only in .: ac3enc.h +Only in .: ac3tab.h +Only in .: apiexample.c +Only in ../../xine-lib/src/libffmpeg/libavcodec/armv4l: CVS +Only in ../../xine-lib/src/libffmpeg/libavcodec/armv4l: Makefile.am +Only in ../../xine-lib/src/libffmpeg/libavcodec/armv4l: Makefile.in +diff -ur ./avcodec.h ../../xine-lib/src/libffmpeg/libavcodec/avcodec.h +--- ./avcodec.h Sat Dec 29 23:59:50 2001 ++++ ../../xine-lib/src/libffmpeg/libavcodec/avcodec.h Sat Dec 29 01:13:29 2001 +@@ -161,6 +161,7 @@ + extern AVCodec h263i_decoder; + extern AVCodec rv10_decoder; + extern AVCodec mjpeg_decoder; ++#ifdef FF_AUDIO_CODECS + extern AVCodec mp3_decoder; + + /* pcm codecs */ +@@ -178,6 +179,7 @@ + PCM_CODEC(CODEC_ID_PCM_MULAW, pcm_mulaw); + + #undef PCM_CODEC ++#endif + + /* dummy raw video codec */ + extern AVCodec rawvideo_codec; +diff -ur ./common.c ../../xine-lib/src/libffmpeg/libavcodec/common.c +--- ./common.c Sat Dec 29 23:59:50 2001 ++++ ../../xine-lib/src/libffmpeg/libavcodec/common.c Sat Dec 29 01:13:30 2001 +@@ -212,7 +212,7 @@ + buf_ptr += 4; + /* handle common case: we can read everything */ + if (buf_ptr <= s->buf_end) { +-#if ARCH_X86 ++#ifdef ARCH_X86 + bit_buf = bswap_32(*((unsigned long*)(&buf_ptr[-4]))); + #else + bit_buf = (buf_ptr[-4] << 24) | +diff -ur ./common.h ../../xine-lib/src/libffmpeg/libavcodec/common.h +--- ./common.h Sat Dec 29 23:59:50 2001 ++++ ../../xine-lib/src/libffmpeg/libavcodec/common.h Wed Jan 2 22:27:05 2002 +@@ -3,6 +3,9 @@ + + #define FFMPEG_VERSION_INT 0x000406 + #define FFMPEG_VERSION "0.4.6" ++/* CVS version as 26-12-2001 */ ++ ++#undef DEBUG + + #if defined(WIN32) && !defined(__MINGW32__) + #define CONFIG_WIN32 +@@ -114,7 +117,7 @@ + #define UINT64_C(c) (c ## ULL) + #endif + +-#include "../bswap.h" ++#include "xine-engine/bswap.h" + + #ifdef USE_FASTMEMCPY + #include "fastmemcpy.h" +@@ -139,10 +142,18 @@ + + #else + ++#ifdef __GNUC__ + #ifdef DEBUG + #define dprintf(fmt,args...) printf(fmt, ## args) + #else + #define dprintf(fmt,args...) ++#endif ++#else ++#ifdef DEBUG ++#define dprintf(fmt,...) printf(fmt, __VA_ARGS__) ++#else ++#define dprintf(fmt,...) ++#endif + #endif + + #endif /* !CONFIG_WIN32 */ +Only in .: dct-test.c +diff -ur ./dsputil.h ../../xine-lib/src/libffmpeg/libavcodec/dsputil.h +--- ./dsputil.h Sat Dec 29 23:59:50 2001 ++++ ../../xine-lib/src/libffmpeg/libavcodec/dsputil.h Sat Dec 29 01:13:32 2001 +@@ -67,7 +67,7 @@ + int pix_abs16x16_y2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); + int pix_abs16x16_xy2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); + +-#if defined (SIMPLE_IDCT) && defined (HAVE_MMX) ++#if defined (SIMPLE_IDCT) && defined (ARCH_X86) + static inline int block_permute_op(int j) + { + static const int table[64]={ +@@ -97,22 +97,22 @@ + + void block_permute(INT16 *block); + +-#if defined(HAVE_MMX) ++#if defined(ARCH_X86) + +-#define MM_MMX 0x0001 /* standard MMX */ +-#define MM_3DNOW 0x0004 /* AMD 3DNOW */ +-#define MM_MMXEXT 0x0002 /* SSE integer functions or AMD MMX ext */ +-#define MM_SSE 0x0008 /* SSE functions */ +-#define MM_SSE2 0x0010 /* PIV SSE2 functions */ ++#define HAVE_MMX 1 ++ ++#include "xineutils.h" + + extern int mm_flags; + +-int mm_support(void); ++#define mm_support() xine_mm_accel() + ++#if 0 + static inline void emms(void) + { + __asm __volatile ("emms;":::"memory"); + } ++#endif + + #define emms_c() \ + {\ +Only in .: fastmemcpy.h +Only in ../../xine-lib/src/libffmpeg/libavcodec/i386: .deps +Only in ../../xine-lib/src/libffmpeg/libavcodec/i386: CVS +Only in ../../xine-lib/src/libffmpeg/libavcodec/i386: Makefile.am +Only in ../../xine-lib/src/libffmpeg/libavcodec/i386: Makefile.in +Only in ./i386: cputest.c +diff -ur ./i386/fdct_mmx.c ../../xine-lib/src/libffmpeg/libavcodec/i386/fdct_mmx.c +--- ./i386/fdct_mmx.c Wed Aug 15 19:25:32 2001 ++++ ../../xine-lib/src/libffmpeg/libavcodec/i386/fdct_mmx.c Sun Dec 30 12:00:11 2001 +@@ -10,7 +10,7 @@ + #include "../common.h" + #include "mmx.h" + +-#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align))) ++//#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align))) + + ////////////////////////////////////////////////////////////////////// + // +@@ -45,8 +45,8 @@ + 23170, 23170, 23170, 23170, //cos * (2<<15) + 0.5 + }; + +-const long long fdct_one_corr ATTR_ALIGN(8) = 0x0001000100010001LL; +-const long fdct_r_row[2] ATTR_ALIGN(8) = {RND_FRW_ROW, RND_FRW_ROW }; ++static const mmx_t fdct_one_corr = {0x0001000100010001LL}; ++static volatile mmx_t fdct_r_row = { d:{RND_FRW_ROW, RND_FRW_ROW} }; + + const int16_t tab_frw_01234567[] ATTR_ALIGN(8) = { // forward_dct coeff table + //row0 +@@ -242,18 +242,18 @@ + punpckhdq_r2r(mm6, mm6); + movq_m2r(*(table + 20), mm7); + pmaddwd_r2r(mm5, mm1); +- paddd_m2r(*fdct_r_row, mm3); ++ paddd_m2r(fdct_r_row, mm3); + pmaddwd_r2r(mm6, mm7); + pmaddwd_m2r(*(table + 12), mm2); + paddd_r2r(mm4, mm3); + pmaddwd_m2r(*(table + 24), mm5); + pmaddwd_m2r(*(table + 28), mm6); + paddd_r2r(mm7, mm1); +- paddd_m2r(*fdct_r_row, mm0); ++ paddd_m2r(fdct_r_row, mm0); + psrad_i2r(SHIFT_FRW_ROW, mm3); +- paddd_m2r(*fdct_r_row, mm1); ++ paddd_m2r(fdct_r_row, mm1); + paddd_r2r(mm2, mm0); +- paddd_m2r(*fdct_r_row, mm5); ++ paddd_m2r(fdct_r_row, mm5); + psrad_i2r(SHIFT_FRW_ROW, mm1); + paddd_r2r(mm6, mm5); + psrad_i2r(SHIFT_FRW_ROW, mm0); +diff -ur ./i386/mmx.h ../../xine-lib/src/libffmpeg/libavcodec/i386/mmx.h +--- ./i386/mmx.h Tue Aug 7 19:40:52 2001 ++++ ../../xine-lib/src/libffmpeg/libavcodec/i386/mmx.h Thu Dec 27 18:02:23 2001 +@@ -1,239 +1 @@ +-/* +- * mmx.h +- * Copyright (C) 1997-2001 H. Dietz and R. Fisher +- */ +- +-/* +- * The type of an value that fits in an MMX register (note that long +- * long constant values MUST be suffixed by LL and unsigned long long +- * values by ULL, lest they be truncated by the compiler) +- */ +- +-typedef union { +- long long q; /* Quadword (64-bit) value */ +- unsigned long long uq; /* Unsigned Quadword */ +- int d[2]; /* 2 Doubleword (32-bit) values */ +- unsigned int ud[2]; /* 2 Unsigned Doubleword */ +- short w[4]; /* 4 Word (16-bit) values */ +- unsigned short uw[4]; /* 4 Unsigned Word */ +- char b[8]; /* 8 Byte (8-bit) values */ +- unsigned char ub[8]; /* 8 Unsigned Byte */ +- float s[2]; /* Single-precision (32-bit) value */ +-} mmx_t; /* On an 8-byte (64-bit) boundary */ +- +- +-#define mmx_i2r(op,imm,reg) \ +- __asm__ __volatile__ (#op " %0, %%" #reg \ +- : /* nothing */ \ +- : "i" (imm) ) +- +-#define mmx_m2r(op,mem,reg) \ +- __asm__ __volatile__ (#op " %0, %%" #reg \ +- : /* nothing */ \ +- : "m" (mem)) +- +-#define mmx_r2m(op,reg,mem) \ +- __asm__ __volatile__ (#op " %%" #reg ", %0" \ +- : "=m" (mem) \ +- : /* nothing */ ) +- +-#define mmx_r2r(op,regs,regd) \ +- __asm__ __volatile__ (#op " %" #regs ", %" #regd) +- +- +-#define emms() __asm__ __volatile__ ("emms") +- +-#define movd_m2r(var,reg) mmx_m2r (movd, var, reg) +-#define movd_r2m(reg,var) mmx_r2m (movd, reg, var) +-#define movd_r2r(regs,regd) mmx_r2r (movd, regs, regd) +- +-#define movq_m2r(var,reg) mmx_m2r (movq, var, reg) +-#define movq_r2m(reg,var) mmx_r2m (movq, reg, var) +-#define movq_r2r(regs,regd) mmx_r2r (movq, regs, regd) +- +-#define packssdw_m2r(var,reg) mmx_m2r (packssdw, var, reg) +-#define packssdw_r2r(regs,regd) mmx_r2r (packssdw, regs, regd) +-#define packsswb_m2r(var,reg) mmx_m2r (packsswb, var, reg) +-#define packsswb_r2r(regs,regd) mmx_r2r (packsswb, regs, regd) +- +-#define packuswb_m2r(var,reg) mmx_m2r (packuswb, var, reg) +-#define packuswb_r2r(regs,regd) mmx_r2r (packuswb, regs, regd) +- +-#define paddb_m2r(var,reg) mmx_m2r (paddb, var, reg) +-#define paddb_r2r(regs,regd) mmx_r2r (paddb, regs, regd) +-#define paddd_m2r(var,reg) mmx_m2r (paddd, var, reg) +-#define paddd_r2r(regs,regd) mmx_r2r (paddd, regs, regd) +-#define paddw_m2r(var,reg) mmx_m2r (paddw, var, reg) +-#define paddw_r2r(regs,regd) mmx_r2r (paddw, regs, regd) +- +-#define paddsb_m2r(var,reg) mmx_m2r (paddsb, var, reg) +-#define paddsb_r2r(regs,regd) mmx_r2r (paddsb, regs, regd) +-#define paddsw_m2r(var,reg) mmx_m2r (paddsw, var, reg) +-#define paddsw_r2r(regs,regd) mmx_r2r (paddsw, regs, regd) +- +-#define paddusb_m2r(var,reg) mmx_m2r (paddusb, var, reg) +-#define paddusb_r2r(regs,regd) mmx_r2r (paddusb, regs, regd) +-#define paddusw_m2r(var,reg) mmx_m2r (paddusw, var, reg) +-#define paddusw_r2r(regs,regd) mmx_r2r (paddusw, regs, regd) +- +-#define pand_m2r(var,reg) mmx_m2r (pand, var, reg) +-#define pand_r2r(regs,regd) mmx_r2r (pand, regs, regd) +- +-#define pandn_m2r(var,reg) mmx_m2r (pandn, var, reg) +-#define pandn_r2r(regs,regd) mmx_r2r (pandn, regs, regd) +- +-#define pcmpeqb_m2r(var,reg) mmx_m2r (pcmpeqb, var, reg) +-#define pcmpeqb_r2r(regs,regd) mmx_r2r (pcmpeqb, regs, regd) +-#define pcmpeqd_m2r(var,reg) mmx_m2r (pcmpeqd, var, reg) +-#define pcmpeqd_r2r(regs,regd) mmx_r2r (pcmpeqd, regs, regd) +-#define pcmpeqw_m2r(var,reg) mmx_m2r (pcmpeqw, var, reg) +-#define pcmpeqw_r2r(regs,regd) mmx_r2r (pcmpeqw, regs, regd) +- +-#define pcmpgtb_m2r(var,reg) mmx_m2r (pcmpgtb, var, reg) +-#define pcmpgtb_r2r(regs,regd) mmx_r2r (pcmpgtb, regs, regd) +-#define pcmpgtd_m2r(var,reg) mmx_m2r (pcmpgtd, var, reg) +-#define pcmpgtd_r2r(regs,regd) mmx_r2r (pcmpgtd, regs, regd) +-#define pcmpgtw_m2r(var,reg) mmx_m2r (pcmpgtw, var, reg) +-#define pcmpgtw_r2r(regs,regd) mmx_r2r (pcmpgtw, regs, regd) +- +-#define pmaddwd_m2r(var,reg) mmx_m2r (pmaddwd, var, reg) +-#define pmaddwd_r2r(regs,regd) mmx_r2r (pmaddwd, regs, regd) +- +-#define pmulhw_m2r(var,reg) mmx_m2r (pmulhw, var, reg) +-#define pmulhw_r2r(regs,regd) mmx_r2r (pmulhw, regs, regd) +- +-#define pmullw_m2r(var,reg) mmx_m2r (pmullw, var, reg) +-#define pmullw_r2r(regs,regd) mmx_r2r (pmullw, regs, regd) +- +-#define por_m2r(var,reg) mmx_m2r (por, var, reg) +-#define por_r2r(regs,regd) mmx_r2r (por, regs, regd) +- +-#define pslld_i2r(imm,reg) mmx_i2r (pslld, imm, reg) +-#define pslld_m2r(var,reg) mmx_m2r (pslld, var, reg) +-#define pslld_r2r(regs,regd) mmx_r2r (pslld, regs, regd) +-#define psllq_i2r(imm,reg) mmx_i2r (psllq, imm, reg) +-#define psllq_m2r(var,reg) mmx_m2r (psllq, var, reg) +-#define psllq_r2r(regs,regd) mmx_r2r (psllq, regs, regd) +-#define psllw_i2r(imm,reg) mmx_i2r (psllw, imm, reg) +-#define psllw_m2r(var,reg) mmx_m2r (psllw, var, reg) +-#define psllw_r2r(regs,regd) mmx_r2r (psllw, regs, regd) +- +-#define psrad_i2r(imm,reg) mmx_i2r (psrad, imm, reg) +-#define psrad_m2r(var,reg) mmx_m2r (psrad, var, reg) +-#define psrad_r2r(regs,regd) mmx_r2r (psrad, regs, regd) +-#define psraw_i2r(imm,reg) mmx_i2r (psraw, imm, reg) +-#define psraw_m2r(var,reg) mmx_m2r (psraw, var, reg) +-#define psraw_r2r(regs,regd) mmx_r2r (psraw, regs, regd) +- +-#define psrld_i2r(imm,reg) mmx_i2r (psrld, imm, reg) +-#define psrld_m2r(var,reg) mmx_m2r (psrld, var, reg) +-#define psrld_r2r(regs,regd) mmx_r2r (psrld, regs, regd) +-#define psrlq_i2r(imm,reg) mmx_i2r (psrlq, imm, reg) +-#define psrlq_m2r(var,reg) mmx_m2r (psrlq, var, reg) +-#define psrlq_r2r(regs,regd) mmx_r2r (psrlq, regs, regd) +-#define psrlw_i2r(imm,reg) mmx_i2r (psrlw, imm, reg) +-#define psrlw_m2r(var,reg) mmx_m2r (psrlw, var, reg) +-#define psrlw_r2r(regs,regd) mmx_r2r (psrlw, regs, regd) +- +-#define psubb_m2r(var,reg) mmx_m2r (psubb, var, reg) +-#define psubb_r2r(regs,regd) mmx_r2r (psubb, regs, regd) +-#define psubd_m2r(var,reg) mmx_m2r (psubd, var, reg) +-#define psubd_r2r(regs,regd) mmx_r2r (psubd, regs, regd) +-#define psubw_m2r(var,reg) mmx_m2r (psubw, var, reg) +-#define psubw_r2r(regs,regd) mmx_r2r (psubw, regs, regd) +- +-#define psubsb_m2r(var,reg) mmx_m2r (psubsb, var, reg) +-#define psubsb_r2r(regs,regd) mmx_r2r (psubsb, regs, regd) +-#define psubsw_m2r(var,reg) mmx_m2r (psubsw, var, reg) +-#define psubsw_r2r(regs,regd) mmx_r2r (psubsw, regs, regd) +- +-#define psubusb_m2r(var,reg) mmx_m2r (psubusb, var, reg) +-#define psubusb_r2r(regs,regd) mmx_r2r (psubusb, regs, regd) +-#define psubusw_m2r(var,reg) mmx_m2r (psubusw, var, reg) +-#define psubusw_r2r(regs,regd) mmx_r2r (psubusw, regs, regd) +- +-#define punpckhbw_m2r(var,reg) mmx_m2r (punpckhbw, var, reg) +-#define punpckhbw_r2r(regs,regd) mmx_r2r (punpckhbw, regs, regd) +-#define punpckhdq_m2r(var,reg) mmx_m2r (punpckhdq, var, reg) +-#define punpckhdq_r2r(regs,regd) mmx_r2r (punpckhdq, regs, regd) +-#define punpckhwd_m2r(var,reg) mmx_m2r (punpckhwd, var, reg) +-#define punpckhwd_r2r(regs,regd) mmx_r2r (punpckhwd, regs, regd) +- +-#define punpcklbw_m2r(var,reg) mmx_m2r (punpcklbw, var, reg) +-#define punpcklbw_r2r(regs,regd) mmx_r2r (punpcklbw, regs, regd) +-#define punpckldq_m2r(var,reg) mmx_m2r (punpckldq, var, reg) +-#define punpckldq_r2r(regs,regd) mmx_r2r (punpckldq, regs, regd) +-#define punpcklwd_m2r(var,reg) mmx_m2r (punpcklwd, var, reg) +-#define punpcklwd_r2r(regs,regd) mmx_r2r (punpcklwd, regs, regd) +- +-#define pxor_m2r(var,reg) mmx_m2r (pxor, var, reg) +-#define pxor_r2r(regs,regd) mmx_r2r (pxor, regs, regd) +- +- +-/* 3DNOW extensions */ +- +-#define pavgusb_m2r(var,reg) mmx_m2r (pavgusb, var, reg) +-#define pavgusb_r2r(regs,regd) mmx_r2r (pavgusb, regs, regd) +- +- +-/* AMD MMX extensions - also available in intel SSE */ +- +- +-#define mmx_m2ri(op,mem,reg,imm) \ +- __asm__ __volatile__ (#op " %1, %0, %%" #reg \ +- : /* nothing */ \ +- : "X" (mem), "X" (imm)) +-#define mmx_r2ri(op,regs,regd,imm) \ +- __asm__ __volatile__ (#op " %0, %%" #regs ", %%" #regd \ +- : /* nothing */ \ +- : "X" (imm) ) +- +-#define mmx_fetch(mem,hint) \ +- __asm__ __volatile__ ("prefetch" #hint " %0" \ +- : /* nothing */ \ +- : "X" (mem)) +- +- +-#define maskmovq(regs,maskreg) mmx_r2ri (maskmovq, regs, maskreg) +- +-#define movntq_r2m(mmreg,var) mmx_r2m (movntq, mmreg, var) +- +-#define pavgb_m2r(var,reg) mmx_m2r (pavgb, var, reg) +-#define pavgb_r2r(regs,regd) mmx_r2r (pavgb, regs, regd) +-#define pavgw_m2r(var,reg) mmx_m2r (pavgw, var, reg) +-#define pavgw_r2r(regs,regd) mmx_r2r (pavgw, regs, regd) +- +-#define pextrw_r2r(mmreg,reg,imm) mmx_r2ri (pextrw, mmreg, reg, imm) +- +-#define pinsrw_r2r(reg,mmreg,imm) mmx_r2ri (pinsrw, reg, mmreg, imm) +- +-#define pmaxsw_m2r(var,reg) mmx_m2r (pmaxsw, var, reg) +-#define pmaxsw_r2r(regs,regd) mmx_r2r (pmaxsw, regs, regd) +- +-#define pmaxub_m2r(var,reg) mmx_m2r (pmaxub, var, reg) +-#define pmaxub_r2r(regs,regd) mmx_r2r (pmaxub, regs, regd) +- +-#define pminsw_m2r(var,reg) mmx_m2r (pminsw, var, reg) +-#define pminsw_r2r(regs,regd) mmx_r2r (pminsw, regs, regd) +- +-#define pminub_m2r(var,reg) mmx_m2r (pminub, var, reg) +-#define pminub_r2r(regs,regd) mmx_r2r (pminub, regs, regd) +- +-#define pmovmskb(mmreg,reg) \ +- __asm__ __volatile__ ("movmskps %" #mmreg ", %" #reg) +- +-#define pmulhuw_m2r(var,reg) mmx_m2r (pmulhuw, var, reg) +-#define pmulhuw_r2r(regs,regd) mmx_r2r (pmulhuw, regs, regd) +- +-#define prefetcht0(mem) mmx_fetch (mem, t0) +-#define prefetcht1(mem) mmx_fetch (mem, t1) +-#define prefetcht2(mem) mmx_fetch (mem, t2) +-#define prefetchnta(mem) mmx_fetch (mem, nta) +- +-#define psadbw_m2r(var,reg) mmx_m2r (psadbw, var, reg) +-#define psadbw_r2r(regs,regd) mmx_r2r (psadbw, regs, regd) +- +-#define pshufw_m2r(var,reg,imm) mmx_m2ri(pshufw, var, reg, imm) +-#define pshufw_r2r(regs,regd,imm) mmx_r2ri(pshufw, regs, regd, imm) +- +-#define sfence() __asm__ __volatile__ ("sfence\n\t") ++#include "xineutils.h" +Only in .: libac3 +Only in .: libavcodec.dsp +Only in ../../xine-lib/src/libffmpeg/libavcodec/mlib: .deps +Only in ../../xine-lib/src/libffmpeg/libavcodec/mlib: CVS +Only in ../../xine-lib/src/libffmpeg/libavcodec/mlib: Makefile.am +Only in ../../xine-lib/src/libffmpeg/libavcodec/mlib: Makefile.in +Only in .: motion_test.c +Only in .: mpegaudio.c +Only in .: mpegaudio.h +Only in .: mpegaudiodec.c +Only in .: mpegaudiodectab.h +Only in .: mpegaudiotab.h +Only in .: mpglib +Only in .: pcm.c +Only in .: resample.c +diff -ur ./utils.c ../../xine-lib/src/libffmpeg/libavcodec/utils.c +--- ./utils.c Sat Dec 29 23:59:55 2001 ++++ ../../xine-lib/src/libffmpeg/libavcodec/utils.c Sat Dec 29 01:13:58 2001 +@@ -413,12 +413,15 @@ + register_avcodec(&h263i_decoder); + register_avcodec(&rv10_decoder); + register_avcodec(&mjpeg_decoder); ++#ifdef FF_AUDIO_CODECS + register_avcodec(&mp3_decoder); + #ifdef CONFIG_AC3 + register_avcodec(&ac3_decoder); + #endif ++#endif + #endif /* CONFIG_DECODERS */ + ++#ifdef FF_AUDIO_CODECS + /* pcm codecs */ + + #define PCM_CODEC(id, name) \ +@@ -435,6 +438,7 @@ + PCM_CODEC(CODEC_ID_PCM_MULAW, pcm_mulaw); + + #undef PCM_CODEC ++#endif + } + + static int encode_init(AVCodecContext *s) |