[FFmpeg-cvslog] smacker: set channel layout
Justin Ruggles
git at videolan.org
Tue Nov 13 11:18:04 CET 2012
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sat Apr 7 18:36:49 2012 -0400| [bfccd76adb514f6bf3dd4bf7f429ca58000f513e] | committer: Justin Ruggles
smacker: set channel layout
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bfccd76adb514f6bf3dd4bf7f429ca58000f513e
---
libavformat/smacker.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index dcca1af..17c7c52 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -24,6 +24,7 @@
*/
#include "libavutil/bswap.h"
+#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "internal.h"
@@ -191,7 +192,13 @@ static int smacker_read_header(AVFormatContext *s)
} else {
ast[i]->codec->codec_id = AV_CODEC_ID_PCM_U8;
}
- ast[i]->codec->channels = (smk->aflags[i] & SMK_AUD_STEREO) ? 2 : 1;
+ if (smk->aflags[i] & SMK_AUD_STEREO) {
+ ast[i]->codec->channels = 2;
+ ast[i]->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else {
+ ast[i]->codec->channels = 1;
+ ast[i]->codec->channel_layout = AV_CH_LAYOUT_MONO;
+ }
ast[i]->codec->sample_rate = smk->rates[i];
ast[i]->codec->bits_per_coded_sample = (smk->aflags[i] & SMK_AUD_16BITS) ? 16 : 8;
if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == AV_CODEC_ID_PCM_U8)
More information about the ffmpeg-cvslog
mailing list