diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-04-27 02:33:27 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-04-27 02:33:27 +0000 |
| commit | 6eb07e7349cd13a66f59e82559d107e89293a954 (patch) | |
| tree | 56e9d9c82ee0a991f889c20311d254117d6e82da /libavcodec | |
| parent | 28fff4c81bbc9171c73c7366321f9b7edb57ce0e (diff) | |
Disentangle dependencies between amr_nb and amr_nb-fixed: amr_nb-fixed does
work even without amr_nb.
Originally committed as revision 5321 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index edde55a1a4..6274f587ea 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -238,16 +238,16 @@ endif AMROBJS= ifeq ($(AMR_NB),yes) +AMROBJS= amr.o +OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o +CLEANAMR=cleanamrfloat +endif + ifeq ($(AMR_NB_FIXED),yes) AMROBJS= amr.o AMREXTRALIBS+= amr/*.o AMRLIBS=amrlibs CLEANAMR=cleanamr -else -AMROBJS= amr.o -OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o -CLEANAMR=cleanamrfloat -endif endif ifeq ($(AMR_WB),yes) |