diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-10-21 13:48:50 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-01 11:29:14 -0400 |
| commit | a3145d0335b04d143c26832c91dcc7242c758206 (patch) | |
| tree | cfb3b13da9a5995b92bfecf1f8d0837c0f0ba53c | |
| parent | a38eadf7ed08293667c9f81780f7c081f278f19a (diff) | |
| download | ffmpeg-a3145d0335b04d143c26832c91dcc7242c758206.tar.gz | |
bmvaudio: set channel layout at init() rather than validating it
| -rw-r--r-- | libavcodec/bmv.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/bmv.c b/libavcodec/bmv.c index 461111967d..53781e74e6 100644 --- a/libavcodec/bmv.c +++ b/libavcodec/bmv.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/audioconvert.h" #include "avcodec.h" #include "bytestream.h" @@ -304,12 +305,9 @@ static av_cold int bmv_aud_decode_init(AVCodecContext *avctx) { BMVAudioDecContext *c = avctx->priv_data; - if (avctx->channels != 2) { - av_log(avctx, AV_LOG_INFO, "invalid number of channels\n"); - return AVERROR(EINVAL); - } - - avctx->sample_fmt = AV_SAMPLE_FMT_S16; + avctx->channels = 2; + avctx->channel_layout = AV_CH_LAYOUT_STEREO; + avctx->sample_fmt = AV_SAMPLE_FMT_S16; avcodec_get_frame_defaults(&c->frame); avctx->coded_frame = &c->frame; |