main/ffmpeg: upgrade to 1.2

and cherry-pick upstream commit bcd3eb3 to silence unmeaningful
errors.

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 0000000000..cd3ad43147
--- /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;