mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-30 22:50:48 +00:00
Fix some #ifdef to allow building amr_wb alone.
patch by Michel Bardiaux < mbardiaux -- dot -- mediaxim -- dot -- be > Originally committed as revision 4615 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
67860b268e
commit
399d84012f
@ -326,7 +326,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#else /* Float point version*/
|
#elif defined(AMR_NB) /* Float point version*/
|
||||||
|
|
||||||
typedef struct AMRContext {
|
typedef struct AMRContext {
|
||||||
int frameCount;
|
int frameCount;
|
||||||
@ -457,6 +457,8 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(AMR_NB) || defined(AMR_NB_FIXED)
|
||||||
|
|
||||||
AVCodec amr_nb_decoder =
|
AVCodec amr_nb_decoder =
|
||||||
{
|
{
|
||||||
"amr_nb",
|
"amr_nb",
|
||||||
@ -481,6 +483,8 @@ AVCodec amr_nb_encoder =
|
|||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
/* -----------AMR wideband ------------*/
|
/* -----------AMR wideband ------------*/
|
||||||
#ifdef AMR_WB
|
#ifdef AMR_WB
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user