summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-06-01 09:39:02 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-06-01 09:39:02 +0000
commitb3f4cd6c521bfb0bab58671a13470f8e5537f0c7 (patch)
tree7c2a225978e7894b73010dc376dc56d4c9825544 /libmpdemux
parent3cd6ded7ea17b49524a2d2a949cc074c905a3df3 (diff)
downloadmpv-b3f4cd6c521bfb0bab58671a13470f8e5537f0c7.tar.bz2
mpv-b3f4cd6c521bfb0bab58671a13470f8e5537f0c7.tar.xz
100l, do not read probe buffer if it will not be used because a format was forced.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29337 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_lavf.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 3eb204e239..42e9dfc071 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -141,12 +141,6 @@ static int lavf_check_file(demuxer_t *demuxer){
av_register_all();
- if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE)
- return 0;
- avpd.filename= demuxer->stream->url;
- avpd.buf= buf;
- avpd.buf_size= PROBE_BUF_SIZE;
-
if (opt_format) {
if (strcmp(opt_format, "help") == 0) {
list_formats();
@@ -160,6 +154,13 @@ static int lavf_check_file(demuxer_t *demuxer){
mp_msg(MSGT_DEMUX,MSGL_INFO,"Forced lavf %s demuxer\n", priv->avif->long_name);
return DEMUXER_TYPE_LAVF;
}
+
+ if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE)
+ return 0;
+ avpd.filename= demuxer->stream->url;
+ avpd.buf= buf;
+ avpd.buf_size= PROBE_BUF_SIZE;
+
priv->avif= av_probe_input_format(&avpd, 1);
if(!priv->avif){
mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");