[FFmpeg-cvslog] daud: set channel layout

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


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sat Apr  7 12:55:12 2012 -0400| [a05a63785c4769a1f3c3cddcc876c5acb6cf4c83] | committer: Justin Ruggles

daud: set channel layout

Update FATE reference due to WAVE channel mask now being set correctly.

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

 libavformat/daud.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/daud.c b/libavformat/daud.c
index dda83f9..3ceb958 100644
--- a/libavformat/daud.c
+++ b/libavformat/daud.c
@@ -18,6 +18,8 @@
  * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/channel_layout.h"
 #include "avformat.h"
 
 static int daud_header(AVFormatContext *s) {
@@ -28,6 +30,7 @@ static int daud_header(AVFormatContext *s) {
     st->codec->codec_id = AV_CODEC_ID_PCM_S24DAUD;
     st->codec->codec_tag = MKTAG('d', 'a', 'u', 'd');
     st->codec->channels = 6;
+    st->codec->channel_layout = AV_CH_LAYOUT_5POINT1;
     st->codec->sample_rate = 96000;
     st->codec->bit_rate = 3 * 6 * 96000 * 8;
     st->codec->block_align = 3 * 6;



More information about the ffmpeg-cvslog mailing list