diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-04-07 14:05:45 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-12 10:33:19 -0500 |
| commit | 024e03701c706d3976348b9f50a1af7db2137a39 (patch) | |
| tree | 36111daa804250ba90b2a01f2ac38618214575d9 | |
| parent | 73e2007f3d435dec6a5ddb6a47e706cc419eb7cd (diff) | |
| download | ffmpeg-024e03701c706d3976348b9f50a1af7db2137a39.tar.gz | |
iff: set channel layout
| -rw-r--r-- | libavformat/iff.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavformat/iff.c b/libavformat/iff.c index c2bc283753..ab22e118f0 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -29,6 +29,7 @@ * http://wiki.multimedia.cx/index.php?title=IFF */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" #include "avformat.h" @@ -120,6 +121,7 @@ static int iff_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->channels = 1; + st->codec->channel_layout = AV_CH_LAYOUT_MONO; avio_skip(pb, 8); // codec_tag used by ByteRun1 decoder to distinguish progressive (PBM) and interlaced (ILBM) content st->codec->codec_tag = avio_rl32(pb); @@ -154,7 +156,13 @@ static int iff_read_header(AVFormatContext *s) case ID_CHAN: if (data_size < 4) return AVERROR_INVALIDDATA; - st->codec->channels = (avio_rb32(pb) < 6) ? 1 : 2; + if (avio_rb32(pb) < 6) { + st->codec->channels = 1; + st->codec->channel_layout = AV_CH_LAYOUT_MONO; + } else { + st->codec->channels = 2; + st->codec->channel_layout = AV_CH_LAYOUT_STEREO; + } break; case ID_CMAP: |