diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-08-16 10:20:25 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-08-16 10:20:25 +0200 |
| commit | e701b0cf7553202085840d3bfd1aff432b4de513 (patch) | |
| tree | e3324e3d1d35dd403eeb801841fe822737b253e4 /libavformat/lxfdec.c | |
| parent | 569027ea80daf928e6c127a27b2d7d23950e4534 (diff) | |
| download | ffmpeg-e701b0cf7553202085840d3bfd1aff432b4de513.tar.gz | |
Support reading 16-channel lxf files.
Fixes ticket #1608.
Reported, analyzed and tested by Gabriel Gerard.
Diffstat (limited to 'libavformat/lxfdec.c')
| -rw-r--r-- | libavformat/lxfdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |