github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

demux: remove demux_add_packet() return value

This commit is contained in:
wm4 2015-10-17 14:27:55 +02:00
parent d27d91715f
commit 9ca312b4b1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demux/demux.c
View File

@ -307,13 +307,12 @@ const char *stream_type_name(enum stream_type type)
}
}
// Returns the same value as demuxer->fill_buffer: 1 ok, 0 EOF/not selected.
int demux_add_packet(struct sh_stream *stream, demux_packet_t *dp)
void demux_add_packet(struct sh_stream *stream, demux_packet_t *dp)
{
struct demux_stream *ds = stream ? stream->ds : NULL;
if (!dp || !ds) {
talloc_free(dp);
return 0;
return;
}
struct demux_internal *in = ds->in;
pthread_mutex_lock(&in->lock);
@ -330,7 +329,7 @@ int demux_add_packet(struct sh_stream *stream, demux_packet_t *dp)
if (!ds->selected || in->seeking || drop) {
pthread_mutex_unlock(&in->lock);
talloc_free(dp);
return 0;
return;
}
dp->stream = stream->index;
@ -371,7 +370,6 @@ int demux_add_packet(struct sh_stream *stream, demux_packet_t *dp)
ds->in->wakeup_cb(ds->in->wakeup_cb_ctx);
pthread_cond_signal(&in->wakeup);
pthread_mutex_unlock(&in->lock);
return 1;
}
// Returns true if there was "progress" (lock was released temporarily).

2
demux/demux.h
View File

@ -242,7 +242,7 @@ typedef struct {
void free_demuxer(struct demuxer *demuxer);
void free_demuxer_and_stream(struct demuxer *demuxer);
int demux_add_packet(struct sh_stream *stream, demux_packet_t *dp);
void demux_add_packet(struct sh_stream *stream, demux_packet_t *dp);
struct demux_packet *demux_read_packet(struct sh_stream *sh);
int demux_read_packet_async(struct sh_stream *sh, struct demux_packet **out_pkt);

4
demux/demux_subreader.c
View File

@ -804,7 +804,9 @@ static int d_fill_buffer(struct demuxer *demuxer)
struct priv *p = demuxer->priv;
struct demux_packet *dp = demux_packet_list_fill(p->pkts, p->num_pkts,
&p->current);
return demux_add_packet(p->sh, dp);
int have_packet = !!dp;
demux_add_packet(p->sh, dp);
return have_packet;
}
static void d_seek(struct demuxer *demuxer, double secs, int flags)