summaryrefslogtreecommitdiffstats
path: root/main/ffmpeg/fix-libv4l2-errors.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-03-30 11:25:09 +0200
committerTimo Teräs <timo.teras@iki.fi>2013-03-30 11:26:23 +0200
commit443c0298107901ec5db84a775af6f642c82580ad (patch)
treea70fbf878c8d00121c4b80fa17653504f62c9c21 /main/ffmpeg/fix-libv4l2-errors.patch
parentc3551851b12534201f77bd3670e1b316b3140cb3 (diff)
downloadaports-443c0298107901ec5db84a775af6f642c82580ad.tar.bz2
aports-443c0298107901ec5db84a775af6f642c82580ad.tar.xz
main/ffmpeg: upgrade to 1.2
and cherry-pick upstream commit bcd3eb3 to silence unmeaningful errors.
Diffstat (limited to 'main/ffmpeg/fix-libv4l2-errors.patch')
-rw-r--r--main/ffmpeg/fix-libv4l2-errors.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/main/ffmpeg/fix-libv4l2-errors.patch b/main/ffmpeg/fix-libv4l2-errors.patch
new file mode 100644
index 000000000..cd3ad4314
--- /dev/null
+++ b/main/ffmpeg/fix-libv4l2-errors.patch
@@ -0,0 +1,25 @@
+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;