From e701b0cf7553202085840d3bfd1aff432b4de513 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 16 Aug 2012 10:20:25 +0200
Subject: Support reading 16-channel lxf files.

Fixes ticket #1608.

Reported, analyzed and tested by Gabriel Gerard.
---
 libavformat/lxfdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavformat/lxfdec.c')

diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index 2722463ec4..539a86a467 100644
--- a/libavformat/lxfdec.c
+++ b/libavformat/lxfdec.c
@@ -272,7 +272,7 @@ static int lxf_read_header(AVFormatContext *s)
     if ((video_params >> 22) & 1)
         av_log(s, AV_LOG_WARNING, "VBI data not yet supported\n");
 
-    if ((lxf->channels = (disk_params >> 2) & 0xF)) {
+    if ((lxf->channels = 1 << (disk_params >> 4 & 3) + 1)) {
         if (!(st = avformat_new_stream(s, NULL)))
             return AVERROR(ENOMEM);
 
-- 
cgit v1.2.1