Skip to content

F
ffmpeg.wasm-core
Commit a3145d03 authored by Justin Ruggles's avatar Justin Ruggles
Browse files
Options

bmvaudio: set channel layout at init() rather than validating it

parent a38eadf7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
libavcodec/bmv.c
View file @ a3145d03
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/audioconvert.h"
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
...@@ -304,12 +305,9 @@ static av_cold int bmv_aud_decode_init(AVCodecContext *avctx) ...@@ -304,12 +305,9 @@ static av_cold int bmv_aud_decode_init(AVCodecContext *avctx)
{ {
BMVAudioDecContext *c = avctx->priv_data; BMVAudioDecContext *c = avctx->priv_data;
if (avctx->channels != 2) { avctx->channels = 2;
av_log(avctx, AV_LOG_INFO, "invalid number of channels\n"); avctx->channel_layout = AV_CH_LAYOUT_STEREO;
return AVERROR(EINVAL); avctx->sample_fmt = AV_SAMPLE_FMT_S16;
}
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
avcodec_get_frame_defaults(&c->frame); avcodec_get_frame_defaults(&c->frame);
avctx->coded_frame = &c->frame; avctx->coded_frame = &c->frame;
......
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