From de288762222beb1e20883f5d2c890ff7460ba318 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 6 Jul 2014 19:02:21 +0200 Subject: demux: minor simplification Oops, should have been part of commit 37085788. --- demux/demux_lavf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demux/demux_lavf.c') diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 94f3e27c8f..db2499d61e 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -391,7 +391,7 @@ static void select_tracks(struct demuxer *demuxer, int start) for (int n = start; n < priv->num_streams; n++) { struct sh_stream *stream = priv->streams[n]; AVStream *st = priv->avfc->streams[n]; - bool selected = stream && demuxer_stream_is_selected(demuxer, stream) && + bool selected = stream && demux_stream_is_selected(stream) && !stream->attached_picture; st->discard = selected ? AVDISCARD_DEFAULT : AVDISCARD_ALL; } @@ -787,7 +787,7 @@ static int demux_lavf_fill_buffer(demuxer_t *demux) struct sh_stream *stream = priv->streams[pkt->stream_index]; AVStream *st = priv->avfc->streams[pkt->stream_index]; - if (!demuxer_stream_is_selected(demux, stream)) { + if (!demux_stream_is_selected(stream)) { talloc_free(pkt); return 1; // don't signal EOF if skipping a packet } -- cgit v1.2.3