From: Justin Ruggles Date: Sat, 7 Apr 2012 21:53:39 +0000 (-0400) Subject: omadec: set channel layout X-Git-Tag: n1.1~19^2~400 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=c9759eb426ea997822bf5e6cc43bb24b249e9e25 omadec: set channel layout --- diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 022942d242..9b229994ba 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -40,6 +40,7 @@ * CODEC SUPPORT: Only ATRAC3 codec is currently supported! */ +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" #include "libavutil/intreadwrite.h" @@ -312,6 +313,7 @@ static int oma_read_header(AVFormatContext *s) framesize = (codec_params & 0x3FF) * 8; jsflag = (codec_params >> 17) & 1; /* get stereo coding mode, 1 for joint-stereo */ st->codec->channels = 2; + st->codec->channel_layout = AV_CH_LAYOUT_STEREO; st->codec->sample_rate = samplerate; st->codec->bit_rate = st->codec->sample_rate * framesize * 8 / 1024; @@ -346,6 +348,7 @@ static int oma_read_header(AVFormatContext *s) case OMA_CODECID_LPCM: /* PCM 44.1 kHz 16 bit stereo big-endian */ st->codec->channels = 2; + st->codec->channel_layout = AV_CH_LAYOUT_STEREO; st->codec->sample_rate = 44100; framesize = 1024; /* bit rate = sample rate x PCM block align (= 4) x 8 */