rpms/ffmpeg/EL-6 ffmpeg-0.10.4-backport-libv4l2.patch,1.2,1.3

Author: kwizart Update of /cvs/free/rpms/ffmpeg/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8016/EL-6 Added Files: ffmpeg-0.10.4-backport-libv4l2.patch Log Message: Recover the missing patch ffmpeg-0.10.4-backport-libv4l2.patch: v4l2.c | 13 ------------- 1 file changed, 13 deletions(-) Index: ffmpeg-0.10.4-backport-libv4l2.patch =================================================================== RCS file: ffmpeg-0.10.4-backport-libv4l2.patch diff -N ffmpeg-0.10.4-backport-libv4l2.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ffmpeg-0.10.4-backport-libv4l2.patch 7 Oct 2012 16:39:23 -0000 1.3 @@ -0,0 +1,33 @@ +X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavdevice%2Fv4... + +diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c +index 4829b1b..2808e13 100644 +--- a/libavdevice/v4l2.c ++++ b/libavdevice/v4l2.c +@@ -156,9 +156,6 @@ static int device_open(AVFormatContext *ctx) + { + struct v4l2_capability cap; + int fd; +-#if CONFIG_LIBV4L2 +- int fd_libv4l; +-#endif + int res, err; + int flags = O_RDWR; + +@@ -175,16 +172,6 @@ static int device_open(AVFormatContext *ctx) + + return AVERROR(err); + } +-#if CONFIG_LIBV4L2 +- fd_libv4l = v4l2_fd_open(fd, 0); +- if (fd < 0) { +- err = AVERROR(errno); +- av_log(ctx, AV_LOG_ERROR, "Cannot open video device with libv4l neither %s : %s\n", +- ctx->filename, strerror(errno)); +- return err; +- } +- fd = fd_libv4l; +-#endif + + res = v4l2_ioctl(fd, VIDIOC_QUERYCAP, &cap); + if (res < 0) {