virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Justin Ruggles 2012-10-21 13:48:50 -04:00
parent a38eadf7ed
commit a3145d0335
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/bmv.c
View File

@ -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)
{ {
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;