generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support for AMR Interface Format 2 patch by ("Torsten Martinsen" <tma gatehouse dk>)

Browse Source 
Originally committed as revision 4007 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Torsten Martinsen 2005-03-05 11:44:25 +00:00 committed by Michael Niedermayer
parent 27ef18d12f
commit 2a515c08f2
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -194,6 +194,7 @@ EXESUF=""
amr_nb="no" amr_nb="no"
amr_wb="no" amr_wb="no"
amr_nb_fixed="no" amr_nb_fixed="no"
amr_if2="no"
sunmlib="no" sunmlib="no"
pthreads="no" pthreads="no"
gpl="no" gpl="no"
@ -467,6 +468,8 @@ for opt do
;; ;;
--enable-amr_wb) amr_wb="yes" --enable-amr_wb) amr_wb="yes"
;; ;;
--enable-amr_if2) amr_if2="yes"
;;
--enable-sunmlib) sunmlib="yes" --enable-sunmlib) sunmlib="yes"
;; ;;
--enable-pthreads) pthreads="yes" --enable-pthreads) pthreads="yes"
@ -1105,6 +1108,7 @@ echo "pthreads support" $pthreads
echo "AMR-NB float support" $amr_nb echo "AMR-NB float support" $amr_nb
echo "AMR-NB fixed support" $amr_nb_fixed echo "AMR-NB fixed support" $amr_nb_fixed
echo "AMR-WB float support" $amr_wb echo "AMR-WB float support" $amr_wb
echo "AMR-WB IF2 support" $amr_if2
echo "network support $network" echo "network support $network"
if test "$network" = "yes" ; then if test "$network" = "yes" ; then
echo "IPv6 support $ipv6" echo "IPv6 support $ipv6"
@ -1541,6 +1545,10 @@ else
echo echo
fi fi
if test "$amr_if2" = "yes" ; then
echo "AMR_CFLAGS=-DIF2=1" >> config.mak
fi
fi fi
diff $TMPH config.h >/dev/null 2>&1 diff $TMPH config.h >/dev/null 2>&1

2
libavcodec/Makefile
View File

@ -7,7 +7,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/libavcodec VPATH=$(SRC_PATH)/libavcodec
# NOTE: -I.. is needed to include config.h # NOTE: -I.. is needed to include config.h
CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
OBJS= bitstream.o utils.o mem.o allcodecs.o \ OBJS= bitstream.o utils.o mem.o allcodecs.o \
mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\