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 75be218f3d3d1c13c737dcef41bc082216a649be..f29b773d6e04f41489d793a5de6a6496facf6e40 100644 (file)
--- 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);