[FFmpeg-cvslog] iss: set channel layout

Justin Ruggles git at videolan.org
Tue Nov 13 11:00:19 CET 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sat Apr  7 16:45:48 2012 -0400| [43711312831504c42d2db3bbeafc893883bee911] | committer: Justin Ruggles

iss: set channel layout

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43711312831504c42d2db3bbeafc893883bee911
---

 libavformat/iss.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libavformat/iss.c b/libavformat/iss.c
index 14f64d2..3f7f4fe 100644
--- a/libavformat/iss.c
+++ b/libavformat/iss.c
@@ -26,6 +26,7 @@
  * @see http://wiki.multimedia.cx/index.php?title=FunCom_ISS
  */
 
+#include "libavutil/channel_layout.h"
 #include "avformat.h"
 #include "internal.h"
 #include "libavutil/avstring.h"
@@ -94,7 +95,13 @@ static av_cold int iss_read_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_ISS;
-    st->codec->channels = stereo ? 2 : 1;
+    if (stereo) {
+        st->codec->channels       = 2;
+        st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+    } else {
+        st->codec->channels       = 1;
+        st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+    }
     st->codec->sample_rate = 44100;
     if(rate_divisor > 0)
          st->codec->sample_rate /= rate_divisor;



More information about the ffmpeg-cvslog mailing list