summaryrefslogtreecommitdiffstats
path: root/demux/demux.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-11 19:17:05 +0200
committerwm4 <wm4@nowhere>2013-07-11 19:17:05 +0200
commitfa74be880c27b350615f62dd4a0d6a32be56c60e (patch)
tree6d6041693f2066cea40f20d68f914331d0905ad9 /demux/demux.h
parent11383696dbfdcd54c3d4637ee027e0fddd420f87 (diff)
downloadmpv-fa74be880c27b350615f62dd4a0d6a32be56c60e.tar.bz2
mpv-fa74be880c27b350615f62dd4a0d6a32be56c60e.tar.xz
tv: add hack in preparation of demux_stream removal
Currently, all demuxer fill_buffer functions have a demux_stream parameter. We want to remove that, but the TV code still depends on it. Add a hack to remove that dependency. The problem with the TV code is that reading video and audio frames blocks, so in order to avoid a deadlock, you should read either of them only if the decoder actually requests new data.
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 fade7533e9..4d4d861b7d 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -317,6 +317,7 @@ struct sh_stream *demuxer_stream_by_demuxer_id(struct demuxer *d,
enum stream_type t, int id);
bool demuxer_stream_is_selected(struct demuxer *d, struct sh_stream *stream);
+bool demuxer_stream_has_packets_queued(struct demuxer *d, struct sh_stream *stream);
void demux_packet_list_sort(struct demux_packet **pkts, int num_pkts);
void demux_packet_list_seek(struct demux_packet **pkts, int num_pkts,