Revision 6636b7e8

View differences:

configure
2066 2066
echo "BUILD_ROOT=$PWD" >> config.mak
2067 2067

  
2068 2068
if test "$amr" = "yes" ; then
2069
  echo "#define AMR 1" >> $TMPH
2070
  echo "AMR=yes" >> config.mak
2069
  echo "#define CONFIG_AMR 1" >> $TMPH
2070
  echo "CONFIG_AMR=yes" >> config.mak
2071 2071
fi
2072 2072

  
2073 2073
if test "$amr_wb" = "yes" ; then
2074
  echo "#define AMR_WB 1" >> $TMPH
2075
  echo "AMR_WB=yes" >> config.mak
2074
  echo "#define CONFIG_AMR_WB 1" >> $TMPH
2075
  echo "CONFIG_AMR_WB=yes" >> config.mak
2076 2076
  echo
2077 2077
  echo "AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204"
2078 2078
  echo "V5.1.0 from "
......
2081 2081
fi
2082 2082

  
2083 2083
if test "$amr_nb" = "yes" ; then
2084
  echo "#define AMR_NB 1" >> $TMPH
2085
  echo "AMR_NB=yes" >> config.mak
2084
  echo "#define CONFIG_AMR_NB 1" >> $TMPH
2085
  echo "CONFIG_AMR_NB=yes" >> config.mak
2086 2086
  echo
2087 2087
  echo "AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104"
2088 2088
  echo "REL-5 V5.1.0 from "
......
2092 2092
fi
2093 2093

  
2094 2094
if test "$amr_nb_fixed" = "yes" ; then
2095
  echo "#define AMR_NB_FIXED 1" >> $TMPH
2096
  echo "AMR_NB_FIXED=yes" >> config.mak
2095
  echo "#define CONFIG_AMR_NB_FIXED 1" >> $TMPH
2096
  echo "CONFIG_AMR_NB_FIXED=yes" >> config.mak
2097 2097
  echo
2098 2098
  echo "AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 "
2099 2099
  echo "REL-5 version 5.1.0 from "
libavcodec/Makefile
228 228
# currently using libdts for dts decoding
229 229
OBJS-$(CONFIG_DTS)                     += dtsdec.o
230 230

  
231
OBJS-$(AMR)                            += amr.o
232
OBJS-$(AMR_NB)                         += amr_float/sp_dec.o     \
231
OBJS-$(CONFIG_AMR)                     += amr.o
232
OBJS-$(CONFIG_AMR_NB)                  += amr_float/sp_dec.o     \
233 233
                                          amr_float/sp_enc.o     \
234 234
                                          amr_float/interf_dec.o \
235 235
                                          amr_float/interf_enc.o
236 236

  
237
ifeq ($(AMR_NB_FIXED),yes)
237
ifeq ($(CONFIG_AMR_NB_FIXED),yes)
238 238
EXTRAOBJS += amr/*.o
239 239
EXTRADEPS=amrlibs
240 240
endif
241 241

  
242
OBJS-$(AMR_WB)                        +=  amrwb_float/dec_acelp.o \
242
OBJS-$(CONFIG_AMR_WB)                 +=  amrwb_float/dec_acelp.o \
243 243
                                          amrwb_float/dec_dtx.o   \
244 244
                                          amrwb_float/dec_gain.o  \
245 245
                                          amrwb_float/dec_if.o    \
libavcodec/allcodecs.c
540 540
#endif //CONFIG_FLASHSV_DECODER
541 541
#endif /* CONFIG_DECODERS */
542 542

  
543
#if defined(AMR_NB) || defined(AMR_NB_FIXED)
543
#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
544 544
#ifdef CONFIG_AMR_NB_DECODER
545 545
    register_avcodec(&amr_nb_decoder);
546 546
#endif //CONFIG_AMR_NB_DECODER
......
549 549
    register_avcodec(&amr_nb_encoder);
550 550
#endif //CONFIG_AMR_NB_ENCODER
551 551
#endif //CONFIG_ENCODERS
552
#endif /* AMR_NB || AMR_NB_FIXED */
552
#endif /* CONFIG_AMR_NB || CONFIG_AMR_NB_FIXED */
553 553

  
554
#ifdef AMR_WB
554
#ifdef CONFIG_AMR_WB
555 555
#ifdef CONFIG_AMR_WB_DECODER
556 556
    register_avcodec(&amr_wb_decoder);
557 557
#endif //CONFIG_AMR_WB_DECODER
......
560 560
    register_avcodec(&amr_wb_encoder);
561 561
#endif //CONFIG_AMR_WB_ENCODER
562 562
#endif //CONFIG_ENCODERS
563
#endif /* AMR_WB */
563
#endif /* CONFIG_AMR_WB */
564 564

  
565 565
#ifdef CONFIG_BMP_DECODER
566 566
    register_avcodec(&bmp_decoder);
libavcodec/amr.c
55 55

  
56 56
#include "avcodec.h"
57 57

  
58
#ifdef AMR_NB_FIXED
58
#ifdef CONFIG_AMR_NB_FIXED
59 59

  
60 60
#define MMS_IO
61 61

  
......
107 107
    return(MR122);
108 108
}
109 109

  
110
#ifdef AMR_NB_FIXED
110
#ifdef CONFIG_AMR_NB_FIXED
111 111
/* fixed point version*/
112 112
/* frame size in serial bitstream file (frame type + serial stream + flags) */
113 113
#define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5)
......
326 326
}
327 327

  
328 328

  
329
#elif defined(AMR_NB) /* Float point version*/
329
#elif defined(CONFIG_AMR_NB) /* Float point version*/
330 330

  
331 331
typedef struct AMRContext {
332 332
    int frameCount;
......
457 457

  
458 458
#endif
459 459

  
460
#if defined(AMR_NB) || defined(AMR_NB_FIXED)
460
#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
461 461

  
462 462
AVCodec amr_nb_decoder =
463 463
{
......
486 486
#endif
487 487

  
488 488
/* -----------AMR wideband ------------*/
489
#ifdef AMR_WB
489
#ifdef CONFIG_AMR_WB
490 490

  
491 491
#ifdef _TYPEDEF_H
492 492
//To avoid duplicate typedefs from typdef in amr-nb
......
661 661
    NULL,
662 662
};
663 663

  
664
#endif //AMR_WB
664
#endif //CONFIG_AMR_WB

Also available in: Unified diff