[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-27-g3b539bf

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3b539bf76e12d93b0281a676fa6009e609054699
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 23:23:08 2009 -0400

    Include patches to allow us to use opencore-amr libraries.
    
      These patches have been applied upstream. Including these now so we may work
      with opencore-amr libraries.

diff --git a/debian/patches/ffmpeg-libamrnb-detection.patch b/debian/patches/ffmpeg-libamrnb-detection.patch
new file mode 100644
index 0000000..39771ba
--- /dev/null
+++ b/debian/patches/ffmpeg-libamrnb-detection.patch
@@ -0,0 +1,13 @@
+Backported patch to allow us to use opencore-amr libraries.
+==========================================================================
+--- a/configure
++++ b/configure
+@@ -1981,7 +1981,7 @@
+ 
+ # these are off by default, so fail if requested and not available
+ enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
+-enabled libamr_nb  && require  libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm
++enabled libamr_nb  && require  libamrnb amrnb/interf_dec.h Decoder_Interface_init -lamrnb -lm
+ enabled libamr_wb  && require  libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm
+ enabled libdirac   && add_cflags $(pkg-config --cflags dirac) &&
+                       require  libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init -ldirac_decoder &&
diff --git a/debian/patches/ffmpeg-libamrwb-ifdef-encoder.patch b/debian/patches/ffmpeg-libamrwb-ifdef-encoder.patch
new file mode 100644
index 0000000..6212f5c
--- /dev/null
+++ b/debian/patches/ffmpeg-libamrwb-ifdef-encoder.patch
@@ -0,0 +1,45 @@
+Backported patch to allow us to use opencore-amr libraries.
+==========================================================================
+--- a/libavcodec/libamr.c
++++ b/libavcodec/libamr.c
+@@ -531,7 +531,9 @@
+ #define typedef_h
+ #endif
+ 
++#if CONFIG_LIBAMR_WB_ENCODER
+ #include <amrwb/enc_if.h>
++#endif
+ #include <amrwb/dec_if.h>
+ #include <amrwb/if_rom.h>
+ 
+@@ -576,6 +578,7 @@
+     Word16 allow_dtx;
+ } AMRWBContext;
+ 
++#if CONFIG_LIBAMR_WB_ENCODER
+ static int amr_wb_encode_init(AVCodecContext * avctx)
+ {
+     AMRWBContext *s = avctx->priv_data;
+@@ -633,6 +636,7 @@
+     size = E_IF_encode(s->state, s->mode, data, frame, s->allow_dtx);
+     return size;
+ }
++#endif
+ 
+ static int amr_wb_decode_init(AVCodecContext * avctx)
+ {
+@@ -702,6 +706,7 @@
+     .long_name = NULL_IF_CONFIG_SMALL("libamr-wb Adaptive Multi-Rate (AMR) Wide-Band"),
+ };
+ 
++#if CONFIG_LIBAMR_WB_ENCODER
+ AVCodec libamr_wb_encoder =
+ {
+     "libamr_wb",
+@@ -715,5 +720,6 @@
+     .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+     .long_name = NULL_IF_CONFIG_SMALL("libamr-wb Adaptive Multi-Rate (AMR) Wide-Band"),
+ };
++#endif
+ 
+ #endif //CONFIG_LIBAMR_WB
diff --git a/debian/patches/series b/debian/patches/series
index 6df5baf..5793edd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,7 @@
 100_kfreebsd
 900_doxyfile
+ffmpeg-libamrnb-detection.patch
+ffmpeg-libamrwb-ifdef-encoder.patch
 # fpic-ftbfs-fix.patch
 # fpic-libpostproc-fix.patch
 # fpic-libswscale-fix.patch

-- 
FFmpeg packaging