summaryrefslogtreecommitdiffstats
path: root/stream/stream.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-17 16:09:17 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-17 16:09:17 +0000
commit58301405824924a8e81017c144338d86ca28eba4 (patch)
treec8a35f24d578a7c3b7d2e8e4f9d278e8d6b4a9d4 /stream/stream.c
parentef1ae8272dac3a004bbb3079c7ece7ea7012d75c (diff)
downloadmpv-58301405824924a8e81017c144338d86ca28eba4.tar.bz2
mpv-58301405824924a8e81017c144338d86ca28eba4.tar.xz
Add preliminary support for streaming via FFmpeg's URProtocol functions.
Basic playback tested for file and http protocols. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29923 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream.c')
-rw-r--r--stream/stream.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/stream/stream.c b/stream/stream.c
index 6a3dd2bc87..c498eb3624 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -58,6 +58,7 @@ extern const stream_info_t stream_info_rtsp_sip;
extern const stream_info_t stream_info_cue;
extern const stream_info_t stream_info_null;
extern const stream_info_t stream_info_mf;
+extern const stream_info_t stream_info_ffmpeg;
extern const stream_info_t stream_info_file;
extern const stream_info_t stream_info_ifo;
extern const stream_info_t stream_info_dvd;
@@ -112,6 +113,9 @@ static const stream_info_t* const auto_open_streams[] = {
#ifdef CONFIG_DVDNAV
&stream_info_dvdnav,
#endif
+#ifdef CONFIG_LIBAVFORMAT
+ &stream_info_ffmpeg,
+#endif
&stream_info_null,
&stream_info_mf,