summaryrefslogtreecommitdiff
path: root/libavformat/swfdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-13 11:09:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-13 11:09:38 +0100
commit799d749c77de28a6790db48b3465ecdc56822d96 (patch)
tree79e62292d12bb4615ba643f2d351d9e6657099e0 /libavformat/swfdec.c
parent7eb40d85f2258df31287dc7a0704cb35e356c077 (diff)
parentb9629acb6b647b31b8b4e3932e836189bd03e5b9 (diff)
downloadffmpeg-799d749c77de28a6790db48b3465ecdc56822d96.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits) yop: set channel layout wtv: set channel layout for mpeg audio westwood_aud: set channel layout wc3movie: set channel layout tmv: set channel layout tiertexseq: set channel layout swfdec: set channel layout sol: set channel layout smacker: set channel layout siff: set channel layout sierravmd: set channel layout rtpdec_amr: set channel layout rsodec: set channel layout rmdec: set channel layout for RA version 3 qcp: set channel layout psxstr: set channel layout omadec: set channel layout oggparsespeex: validate channel count and set channel layout nuv: set channel layout mxg: set channel layout ... Conflicts: libavformat/swfdec.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swfdec.c')
-rw-r--r--libavformat/swfdec.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 193df25e2f..6918b01de1 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -21,6 +21,7 @@
*/
#include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
#include "swf.h"
@@ -194,7 +195,13 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
if (!ast)
return AVERROR(ENOMEM);
ast->id = -1; /* -1 to avoid clash with video stream ch_id */
- ast->codec->channels = 1 + (v&1);
+ if (v & 1) {
+ ast->codec->channels = 2;
+ ast->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else {
+ ast->codec->channels = 1;
+ ast->codec->channel_layout = AV_CH_LAYOUT_MONO;
+ }
ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
ast->codec->codec_id = ff_codec_get_id(swf_audio_codec_tags, (v>>4) & 15);
ast->need_parsing = AVSTREAM_PARSE_FULL;