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

g722dec: set channel layout at initialization instead of validating it

Browse Source
This commit is contained in:
Justin Ruggles
2012-10-15 16:40:44 -04:00
parent ee0e9678e7
commit ec2694d259
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/g722dec.c
View File

@@ -34,6 +34,7 @@
* respectively of each byte are ignored. * respectively of each byte are ignored.
*/ */
#include "libavutil/audioconvert.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "g722.h" #include "g722.h"
@@ -57,10 +58,8 @@ static av_cold int g722_decode_init(AVCodecContext * avctx)
{ {
G722Context *c = avctx->priv_data; G722Context *c = avctx->priv_data;
if (avctx->channels != 1) { avctx->channels = 1;
av_log(avctx, AV_LOG_ERROR, "Only mono tracks are allowed.\n"); avctx->channel_layout = AV_CH_LAYOUT_MONO;
return AVERROR_INVALIDDATA;
}
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_S16;
c->band[0].scale_factor = 8; c->band[0].scale_factor = 8;