Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

demux: minor simplification to internal API

Browse Source 
Also some other unrelated minor changes.
This commit is contained in:
wm4
2014-07-05 16:59:44 +02:00
parent de71b50249
commit 37085788e4
9 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stream/tv.c
View File

@@ -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);