mirror of https://git.ffmpeg.org/ffmpeg.git
Enable AMR_NB decoder/encoder when either AMR_NB or AMR_NB_FIXED is defined.
Originally committed as revision 5325 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
3ed410a6bd
commit
c4921874f5
|
@ -531,7 +531,7 @@ void avcodec_register_all(void)
|
||||||
#endif //CONFIG_RAWVIDEO_DECODER
|
#endif //CONFIG_RAWVIDEO_DECODER
|
||||||
#endif /* CONFIG_DECODERS */
|
#endif /* CONFIG_DECODERS */
|
||||||
|
|
||||||
#ifdef AMR_NB
|
#if defined(AMR_NB) || defined(AMR_NB_FIXED)
|
||||||
#ifdef CONFIG_AMR_NB_DECODER
|
#ifdef CONFIG_AMR_NB_DECODER
|
||||||
register_avcodec(&amr_nb_decoder);
|
register_avcodec(&amr_nb_decoder);
|
||||||
#endif //CONFIG_AMR_NB_DECODER
|
#endif //CONFIG_AMR_NB_DECODER
|
||||||
|
@ -540,7 +540,7 @@ void avcodec_register_all(void)
|
||||||
register_avcodec(&amr_nb_encoder);
|
register_avcodec(&amr_nb_encoder);
|
||||||
#endif //CONFIG_AMR_NB_ENCODER
|
#endif //CONFIG_AMR_NB_ENCODER
|
||||||
#endif //CONFIG_ENCODERS
|
#endif //CONFIG_ENCODERS
|
||||||
#endif /* AMR_NB */
|
#endif /* AMR_NB || AMR_NB_FIXED */
|
||||||
|
|
||||||
#ifdef AMR_WB
|
#ifdef AMR_WB
|
||||||
#ifdef CONFIG_AMR_WB_DECODER
|
#ifdef CONFIG_AMR_WB_DECODER
|
||||||
|
|
Loading…
Reference in New Issue