summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-03 04:51:55 +0200
committerwm4 <wm4@nowhere>2012-08-03 04:51:55 +0200
commit4ced6d4e78d5f8304af8f36276c01789450491cd (patch)
treebd4f39cadfe2c38ddd19e864048c351c09478cea
parent548bae63e783eb7a01c088a2a6c6e4051c42e4bf (diff)
downloadmpv-4ced6d4e78d5f8304af8f36276c01789450491cd.tar.bz2
mpv-4ced6d4e78d5f8304af8f36276c01789450491cd.tar.xz
mplayer, stream_tv: move variable initialization
It's not clear why that was done in mplayer's main function.
-rw-r--r--mplayer.c4
-rw-r--r--stream/stream_tv.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/mplayer.c b/mplayer.c
index a10dcd3d35..e521f20897 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3491,10 +3491,6 @@ int main(int argc, char *argv[])
set_path_env();
#endif
-#ifdef CONFIG_TV
- stream_tv_defaults.immediate = 1;
-#endif
-
parse_cfgfiles(mpctx, mpctx->mconfig);
mpctx->playlist = talloc_struct(mpctx, struct playlist, {0});
diff --git a/stream/stream_tv.c b/stream/stream_tv.c
index 4bd373fd10..0f454663ca 100644
--- a/stream/stream_tv.c
+++ b/stream/stream_tv.c
@@ -49,7 +49,7 @@ tv_param_t stream_tv_defaults = {
-1.0, //fps
NULL, //channels
0, //noaudio;
- 0, //immediate;
+ 1, //immediate;
44100, //audiorate;
0, //audio_id
-1, //amode