From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 16 Aug 2012 08:20:25 +0000 (+0200)
Subject: lxf: Support 16-channel files
X-Git-Tag: v10_alpha1~649
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=839df90c718dcab9b9e91ca3c7e73479b3e8103c;p=platform%2Fupstream%2Flibav.git

lxf: Support 16-channel files

Reported, analyzed and tested by Gabriel Gerard.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---

diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index 75be218..f29b773 100644
--- a/libavformat/lxfdec.c
+++ b/libavformat/lxfdec.c
@@ -270,7 +270,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);