[SCM] libav/experimental: Fix METEOR vs. BKTR typo, noticed by Steve O'Hara-Smith, steve sohara org.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:51:39 UTC 2013


The following commit has been merged in the experimental branch:
commit 71e4218054c7547f17864a9e6c8ba9306cbdd391
Author: Diego Biurrun <diego at biurrun.de>
Date:   Tue Sep 22 14:44:44 2009 +0000

    Fix METEOR vs. BKTR typo, noticed by Steve O'Hara-Smith, steve sohara org.
    
    Originally committed as revision 19965 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index dfcd332..33744aa 100644
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -32,7 +32,7 @@
 #elif HAVE_MACHINE_IOCTL_METEOR_H && HAVE_MACHINE_IOCTL_BT848_H
 # include <machine/ioctl_meteor.h>
 # include <machine/ioctl_bt848.h>
-#elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_METEOR_IOCTL_BT848_H
+#elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H
 # include <dev/video/meteor/ioctl_meteor.h>
 # include <dev/video/bktr/ioctl_bt848.h>
 #elif HAVE_DEV_IC_BT8XX_H

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list