Revision 6636b7e8 libavcodec/amr.c

View differences:

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