diff options
author | wm4 <wm4@nowhere> | 2012-12-08 20:14:13 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-12-11 00:37:54 +0100 |
commit | 222a5cf7c0a4de094f368f7154122a72312dbf39 (patch) | |
tree | f8189ba3a04192a1ecbf066baa900daecb763787 /demux/video.c | |
parent | 323eb54b60db4780ca7a9a6de375882eca24becd (diff) | |
download | mpv-222a5cf7c0a4de094f368f7154122a72312dbf39.tar.bz2 mpv-222a5cf7c0a4de094f368f7154122a72312dbf39.tar.xz |
demux_lavf: make minimum probe score customizable, remove lavf_preferred
libavformat wants to read a full ~400KB of data to determine whether
it's really AAC. This causes slow startup with AAC web radio streams [1]
(possible due to a broken initial packet). There are similar issues
with other file formats.
Make the probe "score" (libavformat's mechanism for testing file
formats) configurable with the -lavfdtops:probescore option. This allows
lowering the amount of data read on probing. If the probe score is below
the probescore option value, demux_lavf will try to get a higher score
by feeding more data to libavformat, until the required score or the
max. probe size is reached.
Remove the lavf_preferred demuxer entry. This had a purpose in
mplayer-svn, but now there doesn't seem to be any good reason for it
to exist. Make sure that our native "good" demuxers are above
demux_lavf in demuxer_list[] instead (so that they are preferred).
[1] http://lr2mp0.latvijasradio.lv:8000
Diffstat (limited to 'demux/video.c')
-rw-r--r-- | demux/video.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/demux/video.c b/demux/video.c index 089bc852b4..6a9b6b370b 100644 --- a/demux/video.c +++ b/demux/video.c @@ -590,7 +590,6 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** } break; case DEMUXER_TYPE_LAVF: - case DEMUXER_TYPE_LAVF_PREFERRED: if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){ double next_pts = ds_get_next_pts(d_video); double d= (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts-pts1; |