Commit 6532cd55 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Move AMR-WB-specific code to the AMR-WB section of the file.

Fixes compilation when AMR-NB #includes are not available on the system.

Originally committed as revision 18870 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4e1424fd
......@@ -57,6 +57,22 @@
#include "avcodec.h"
static void amr_decode_fix_avctx(AVCodecContext *avctx)
{
const int is_amr_wb = 1 + (avctx->codec_id == CODEC_ID_AMR_WB);
if (!avctx->sample_rate)
avctx->sample_rate = 8000 * is_amr_wb;
if (!avctx->channels)
avctx->channels = 1;
avctx->frame_size = 160 * is_amr_wb;
avctx->sample_fmt = SAMPLE_FMT_S16;
}
#if CONFIG_LIBAMR_NB
#include <amrnb/interf_dec.h>
#include <amrnb/interf_enc.h>
......@@ -90,22 +106,6 @@ static int getBitrateMode(int bitrate)
return -1;
}
static void amr_decode_fix_avctx(AVCodecContext *avctx)
{
const int is_amr_wb = 1 + (avctx->codec_id == CODEC_ID_AMR_WB);
if (!avctx->sample_rate)
avctx->sample_rate = 8000 * is_amr_wb;
if (!avctx->channels)
avctx->channels = 1;
avctx->frame_size = 160 * is_amr_wb;
avctx->sample_fmt = SAMPLE_FMT_S16;
}
#if CONFIG_LIBAMR_NB
typedef struct AMRContext {
int frameCount;
void *decState;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment