projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
779951c
)
lxf: Support 16-channel files
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Thu, 16 Aug 2012 08:20:25 +0000
(10:20 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Thu, 26 Sep 2013 23:33:45 +0000
(
01:33
+0200)
Reported, analyzed and tested by Gabriel Gerard.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavformat/lxfdec.c
patch
|
blob
|
history
diff --git
a/libavformat/lxfdec.c
b/libavformat/lxfdec.c
index
75be218
..
f29b773
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);