diff options
| author | wm4 <wm4@nowhere> | 2014-07-05 16:59:44 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-07-05 17:07:15 +0200 |
| commit | 37085788e4d25b9eba65e850b80c8184b51b0ad3 (patch) | |
| tree | 457e5aec0ef26f19b1c9b64faebfd7ede13c222a /stream | |
| parent | de71b502495cf3c1ce778a141da574d715582f97 (diff) | |
| download | mpv-37085788e4d25b9eba65e850b80c8184b51b0ad3.tar.bz2 mpv-37085788e4d25b9eba65e850b80c8184b51b0ad3.tar.xz | |
demux: minor simplification to internal API
Also some other unrelated minor changes.
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/tv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/tv.c b/stream/tv.c index 291e20240e..8b33484966 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -298,7 +298,7 @@ static int demux_tv_fill_buffer(demuxer_t *demux) for (int n = 0; n < demux->num_streams; n++) { struct sh_stream *sh = demux->streams[n]; - if (!demuxer_stream_has_packets_queued(demux, sh) && + if (!demux_has_packet(sh) && demuxer_stream_is_selected(demux, sh)) { if (sh->type == STREAM_AUDIO) @@ -319,7 +319,7 @@ static int demux_tv_fill_buffer(demuxer_t *demux) dp=new_demux_packet(len); dp->keyframe = true; dp->pts=tvh->functions->grab_audio_frame(tvh->priv, dp->buffer,len); - demuxer_add_packet(demux, want_audio, dp); + demux_add_packet(want_audio, dp); } /* ================== ADD VIDEO PACKET =================== */ @@ -331,7 +331,7 @@ static int demux_tv_fill_buffer(demuxer_t *demux) dp=new_demux_packet(len); dp->keyframe = true; dp->pts=tvh->functions->grab_video_frame(tvh->priv, dp->buffer, len); - demuxer_add_packet(demux, want_video, dp); + demux_add_packet(want_video, dp); } if (tvh->tv_param->scan) tv_scan(tvh); |