path: root/stream/stream_mf.c
diff options
authorwm4 <wm4@nowhere>2013-07-12 21:58:11 +0200
committerwm4 <wm4@nowhere>2013-07-12 22:16:26 +0200
commit3269bd178020c5d821e8b2d1fd807a38d63e93ce (patch)
tree474e0f7a712cc7002984ec1bdda7d445b5fd8c77 /stream/stream_mf.c
parent311d2f199a7b1f4d819cfb799a0f0f571596b91e (diff)
demux: rewrite probing and demuxer initialization
Get rid of the strange and messy reliance on DEMUXER_TYPE_ constants. Instead of having two open functions for the demuxer callbacks (which somehow are both optional, but you can also decide to implement both...), just have one function. This function takes a parameter that tells the demuxer how strictly it should check for the file headers. This is a nice simplification and allows more flexibility. Remove the file extension code. This literally did nothing (anymore). Change demux_lavf so that we check our other builtin demuxers first before libavformat tries to guess by file extension.
Diffstat (limited to 'stream/stream_mf.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/stream_mf.c b/stream/stream_mf.c
index eef5d6fc4d..9354005ae4 100644
--- a/stream/stream_mf.c
+++ b/stream/stream_mf.c
@@ -32,7 +32,7 @@ static int
mf_stream_open (stream_t *stream, int mode, void *opts)
stream->type = STREAMTYPE_MF;
- stream->demuxer = "lavf";
+ stream->demuxer = "mf";
return STREAM_OK;