From f2ad12a8199013645e9e6a69ea7c5d25ad4c3d61 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 8 Jul 2013 03:19:46 +0200
Subject: stream_radio: fix build

This was accidentally broken with 37c5c11 and has been nroken for
5 months.

Does anyone (want to) use this at all?
---
 stream/stream_radio.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'stream')

diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 49a3353c2a..fae9be43d1 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -37,6 +37,10 @@
 
 #include <linux/types.h>
 
+#ifdef CONFIG_RADIO_V4L2
+#include <linux/videodev2.h>
+#endif
+
 #include "stream.h"
 #include "demux/demux.h"
 #include "core/m_struct.h"
-- 
cgit v1.2.3


From 1a8ab1d6adb8d849ed6f1b8a31baf0ef31242e4a Mon Sep 17 00:00:00 2001
From: Martin Herkt <lachs0r@srsfckn.biz>
Date: Mon, 8 Jul 2013 13:21:24 +0200
Subject: stream/tv: remove unused dshow-specific options

---
 stream/stream_tv.c |  6 +-----
 stream/tv.h        | 21 ---------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

(limited to 'stream')

diff --git a/stream/stream_tv.c b/stream/stream_tv.c
index 0a519efb25..595657dc43 100644
--- a/stream/stream_tv.c
+++ b/stream/stream_tv.c
@@ -72,11 +72,7 @@ tv_param_t stream_tv_defaults = {
     -1,            //gain
     0,             //scan_autostart
     50,            //scan_threshold
-    0.5,            //scan_period
-    0,             //hidden_video_renderer;
-    0,             //hidden_vp_renderer;
-    0,             //system_clock;
-    0              //normalize_audio_chunks;
+    0.5,           //scan_period
 };
 
 #define ST_OFF(f) M_ST_OFF(tv_param_t,f)
diff --git a/stream/tv.h b/stream/tv.h
index 178c23563c..660a78be7b 100644
--- a/stream/tv.h
+++ b/stream/tv.h
@@ -73,27 +73,6 @@ typedef struct tv_param_s {
       Will help if video freezes but audio does not.
       May not work with -vo directx and -vf crop combination.
     */
-    int hidden_video_renderer;
-    /**
-      For VIVO cards VP pin have to be rendered too.
-      This tweak will cause VidePort pin stream to be terminated with video renderer
-      instead of removing it from graph.
-      Use if your card have vp pin and video is still choppy.
-      May not work with -vo directx and -vf crop combination.
-    */
-    int hidden_vp_renderer;
-    /**
-      Use system clock as sync source instead of default graph clock (usually the clock
-      from one of live sources in graph.
-    */
-    int system_clock;
-    /**
-      Some audio cards creates audio chunks with about 0.5 sec size.
-      This can cause choppy video when using mplayer with immediatemode=0
-      Use followingtweak to decrease audio chunk sizes.
-      It will create audio chunks with time length equal to one video frame time.
-    */
-    int normalize_audio_chunks;
 } tv_param_t;
 
 extern tv_param_t stream_tv_defaults;
-- 
cgit v1.2.3


From 846f46ec1df39fb65490a90826039eb709261da0 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Mon, 8 Jul 2013 19:26:45 +0200
Subject: cache: fix compilation without posix timers

This is a regression caused by 854303a. This commit removed the include of
`sys/time.h` which was included in `cache.c` through a chain of recurvive
includes.
---
 stream/cache.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'stream')

diff --git a/stream/cache.c b/stream/cache.c
index 4015aae82c..4a062538db 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -43,6 +43,7 @@
 #include <assert.h>
 #include <pthread.h>
 #include <time.h>
+#include <sys/time.h>
 
 #include <libavutil/common.h>
 
-- 
cgit v1.2.3