From 1ad1088977f85accdabaed75634c45a81a6fdc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Jendrysik?= Date: Wed, 17 Dec 2014 09:12:50 +0100 Subject: main/ffmpeg: upgrade to 2.5.1, remove needless patches --- main/ffmpeg/fix-libv4l2-errors.patch | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 main/ffmpeg/fix-libv4l2-errors.patch (limited to 'main/ffmpeg/fix-libv4l2-errors.patch') diff --git a/main/ffmpeg/fix-libv4l2-errors.patch b/main/ffmpeg/fix-libv4l2-errors.patch deleted file mode 100644 index cd3ad43147..0000000000 --- a/main/ffmpeg/fix-libv4l2-errors.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit bcd3eb3 -Author: Giorgio Vazzana -Date: Fri Mar 8 13:03:43 2013 +0100 - - lavd/v4l2: silence libv4l2 logging - - Signed-off-by: Michael Niedermayer - -diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c -index 0c1eb85..2d7773a 100644 ---- a/libavdevice/v4l2.c -+++ b/libavdevice/v4l2.c -@@ -884,6 +884,12 @@ static int v4l2_read_header(AVFormatContext *s1) - if (!st) - return AVERROR(ENOMEM); - -+#if CONFIG_LIBV4L2 -+ /* silence libv4l2 logging. if fopen() fails v4l2_log_file will be NULL -+ and errors will get sent to stderr */ -+ v4l2_log_file = fopen("/dev/null", "w"); -+#endif -+ - s->fd = device_open(s1); - if (s->fd < 0) - return s->fd; -- cgit v1.2.3