diff options
| author | Łukasz Jendrysik <scadu@yandex.com> | 2014-12-17 09:12:50 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-17 12:28:52 +0000 |
| commit | 1ad1088977f85accdabaed75634c45a81a6fdc2a (patch) | |
| tree | 94e3963452b304b5748322532ad1c64697da57e8 /main/ffmpeg/fix-libv4l2-errors.patch | |
| parent | 102e9e432d62d3b838b7d08923cbb456cfa1b65c (diff) | |
| download | aports-1ad1088977f85accdabaed75634c45a81a6fdc2a.tar.bz2 aports-1ad1088977f85accdabaed75634c45a81a6fdc2a.tar.xz | |
main/ffmpeg: upgrade to 2.5.1, remove needless patches
Diffstat (limited to 'main/ffmpeg/fix-libv4l2-errors.patch')
| -rw-r--r-- | main/ffmpeg/fix-libv4l2-errors.patch | 25 |
1 files changed, 0 insertions, 25 deletions
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 <mywing81@gmail.com> -Date: Fri Mar 8 13:03:43 2013 +0100 - - lavd/v4l2: silence libv4l2 logging - - Signed-off-by: Michael Niedermayer <michaelni@gmx.at> - -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; |