summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-11 20:05:43 +0200
committerwm4 <wm4@nowhere>2013-07-11 20:05:43 +0200
commit3a7fa5b186fc130c159b072cb86194644f9876fb (patch)
tree4eeb7167350e576a6eb9123b99a572a850d8f9e8
parentac080c77fb9835db3c5a8c42e0ea18fdf209ea09 (diff)
downloadmpv-3a7fa5b186fc130c159b072cb86194644f9876fb.tar.bz2
mpv-3a7fa5b186fc130c159b072cb86194644f9876fb.tar.xz
demux: allow passing NULL as packet to demuxer_add_packet()
demux_subreader relied on this.
-rw-r--r--demux/demux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 1ae4137e62..3cd23a4b42 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -392,7 +392,7 @@ int demuxer_add_packet(demuxer_t *demuxer, struct sh_stream *stream,
demux_packet_t *dp)
{
struct demux_stream *ds = stream ? stream->ds : NULL;
- if (!ds || !ds->selected) {
+ if (!dp || !ds || !ds->selected) {
talloc_free(dp);
return 0;
}