[FFmpeg-cvslog] Support reading 16-channel lxf files.

Carl Eugen Hoyos git at videolan.org
Thu Aug 16 10:21:43 CEST 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Aug 16 10:20:25 2012 +0200| [e701b0cf7553202085840d3bfd1aff432b4de513] | committer: Carl Eugen Hoyos

Support reading 16-channel lxf files.

Fixes ticket #1608.

Reported, analyzed and tested by Gabriel Gerard.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e701b0cf7553202085840d3bfd1aff432b4de513
---

 libavformat/lxfdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index 2722463..539a86a 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);
 



More information about the ffmpeg-cvslog mailing list