aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/lxfdec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-08-16 10:20:25 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-09-27 01:33:45 +0200
commit839df90c718dcab9b9e91ca3c7e73479b3e8103c (patch)
tree573ebef597b16e6223859133530518f7b5ed93fb /libavformat/lxfdec.c
parent779951cd2c1b1efaf3d46efeb53fb23fc69bd0e1 (diff)
downloadffmpeg-839df90c718dcab9b9e91ca3c7e73479b3e8103c.tar.gz
lxf: Support 16-channel files
Reported, analyzed and tested by Gabriel Gerard. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat/lxfdec.c')
-rw-r--r--libavformat/lxfdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index 75be218f3d..f29b773d6e 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);