summaryrefslogtreecommitdiffstats
path: root/demux/demux.h
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-01-27 20:37:51 +0000
committerwm4 <wm4@nowhere>2012-12-11 00:37:55 +0100
commit4a40eeda941717b1a3d60d22c0c1020ea9c2038d (patch)
tree968a4d34572a9ae449b1805d380668c71d417b56 /demux/demux.h
parentfdbf43705581ee676d3e1d22210def3e21ce8fb3 (diff)
downloadmpv-4a40eeda941717b1a3d60d22c0c1020ea9c2038d.tar.bz2
mpv-4a40eeda941717b1a3d60d22c0c1020ea9c2038d.tar.xz
demux: fix behavior with files that have sparse video packets
Improve EOF handling in ds_fill_buffer for the case where one stream ends much earlier than the others, in particular make sure the "too many ..." message is not printed over and over. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32823 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demuxer.c Try to improve seeking in files with only few video packets, in particular files with cover art. This might cause issues with badly interleaved files, particularly together with -audio-delay, even though I did not see issues in my very limited testing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35486 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demuxer.c libmpdemux/demuxer.h Fix code that detects streams temporarily lacking data to work properly with e.g. DVDs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35499 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demuxer.c Make stream eof detection less sensitive. Fixes bug #2111. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35543 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demuxer.c
Diffstat (limited to 'demux/demux.h')
-rw-r--r--demux/demux.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux.h b/demux/demux.h
index c2b8ce69c1..13500c0372 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -120,6 +120,7 @@ typedef struct demux_stream {
int pack_no; // serial number of packet
bool keyframe; // keyframe flag of current packet
//---------------
+ int fill_count; // number of unsuccessful tries to get a packet
int packs; // number of packets in buffer
int bytes; // total bytes of packets in buffer
demux_packet_t *first; // read to current buffer from here