[PATCH] ffmpeg - obsługa amr (narrow band)

[Michal Kochanowicz]

W załączniku patche dodające obsługę kodeka amrnb do ffmpeg.

-- 
--= Michal Kochanowicz =--==--==BOFH==--==--= michal at michal.waw.pl =--
--= finger me for PGP public key or visit http://michal.waw.pl/PGP =--
--==--==--==--==--==-- Vodka. Connecting people.--==--==--==--==--==--
A chodzenie po górach SSIE!!!
-------------- next part --------------
Index: ffmpeg.spec
===================================================================
RCS file: /cvsroot/SPECS/ffmpeg.spec,v
retrieving revision 1.69
diff -u -r1.69 ffmpeg.spec
--- ffmpeg.spec	2 Feb 2006 11:52:37 -0000	1.69
+++ ffmpeg.spec	19 Feb 2006 11:16:41 -0000
@@ -9,7 +9,7 @@
 Name:		ffmpeg
 Version:	0.4.9
 %define	snap	20060129
-Release:	3.%{snap}.8
+Release:	3.%{snap}.9
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 License:	GPL
 Group:		Daemons
@@ -20,8 +20,10 @@
 Patch0:		%{name}-libtool.patch
 Patch1:		%{name}-libdir.patch
 Patch2:		%{name}-gcc4.patch
+Patch3:		%{name}-amrnb.patch
 URL:		http://ffmpeg.sourceforge.net/
 BuildRequires:	SDL-devel
+BuildRequires:	amrnb-devel
 BuildRequires:	faac-devel
 BuildRequires:	faad2-devel
 BuildRequires:	freetype-devel
@@ -155,6 +157,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # notes:
@@ -167,6 +170,7 @@
 	--disable-strip \
 	--enable-a52 \
 	--enable-a52bin \
+	--enable-amr_nb \
 	--enable-dts \
 	--enable-faac \
 	--enable-faadbin \
-------------- next part --------------
diff -urN ffmpeg.orig/configure ffmpeg/configure
--- ffmpeg.orig/configure	2006-02-17 19:58:52.000000000 +0100
+++ ffmpeg/configure	2006-02-17 20:07:20.000000000 +0100
@@ -566,6 +566,7 @@
   --enable-small) optimize="small"
   ;;
   --enable-amr_nb) amr_nb="yes"
+    extralibs="$extralibs -lamrnb"
   ;;
   --enable-amr_nb-fixed) amr_nb_fixed="yes"
   ;;
diff -ur ffmpeg.orig/libavcodec/Makefile ffmpeg/libavcodec/Makefile
--- ffmpeg.orig/libavcodec/Makefile	2006-02-17 19:58:52.000000000 +0100
+++ ffmpeg/libavcodec/Makefile	2006-02-17 20:22:51.000000000 +0100
@@ -220,7 +220,7 @@
 CLEANAMR=cleanamr
 else
 AMROBJS= amr.lo
-OBJS+= amr_float/sp_dec.lo amr_float/sp_enc.lo amr_float/interf_dec.lo amr_float/interf_enc.lo
+#OBJS+= amr_float/sp_dec.lo amr_float/sp_enc.lo amr_float/interf_dec.lo amr_float/interf_enc.lo
 CLEANAMR=cleanamrfloat
 endif
 endif
diff -ur ffmpeg.orig/libavcodec/amr.c ffmpeg/libavcodec/amr.c
--- ffmpeg.orig/libavcodec/amr.c	2006-01-12 23:43:14.000000000 +0100
+++ ffmpeg/libavcodec/amr.c	2006-02-17 21:38:34.000000000 +0100
@@ -59,16 +59,16 @@
 
 #define MMS_IO
 
-#include "amr/sp_dec.h"
-#include "amr/d_homing.h"
-#include "amr/typedef.h"
-#include "amr/sp_enc.h"
-#include "amr/sid_sync.h"
-#include "amr/e_homing.h"
+#include "amrnb/sp_dec.h"
+#include "amrnb/d_homing.h"
+#include "amrnb/typedef.h"
+#include "amrnb/sp_enc.h"
+#include "amrnb/sid_sync.h"
+/*#include "amrnb/e_homing.h"*/
 
 #else
-#include "amr_float/interf_dec.h"
-#include "amr_float/interf_enc.h"
+#include "amrnb/interf_dec.h"
+#include "amrnb/interf_enc.h"
 #endif
 
 /* Common code for fixed and float version*/