From f09b2ff661040828e2b17fad89613f7706b10e7d Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 27 Nov 2013 20:54:07 +0100 Subject: cosmetics: rename video/audio reset functions These used the suffix _resync_stream, which is a bit misleading. Nothing gets "resynchronized", they really just reset state. (Some audio decoders actually used to "resync" by reading packets for resuming playback, but that's not the case anymore.) Also move the function in dec_video.c to the top of the file. --- audio/decode/dec_audio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'audio/decode/dec_audio.c') diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c index 6f46b79a93..26452b702e 100644 --- a/audio/decode/dec_audio.c +++ b/audio/decode/dec_audio.c @@ -135,7 +135,7 @@ static const struct ad_functions *find_driver(const char *name) int audio_init_best_codec(struct dec_audio *d_audio, char *audio_decoders) { assert(!d_audio->ad_driver); - audio_resync_stream(d_audio); + audio_reset_decoding(d_audio); struct mp_decoder_entry *decoder = NULL; struct mp_decoder_list *list = @@ -347,10 +347,10 @@ int audio_decode(struct dec_audio *d_audio, struct mp_audio_buffer *outbuf, return 0; } -void audio_resync_stream(struct dec_audio *d_audio) +void audio_reset_decoding(struct dec_audio *d_audio) { d_audio->pts = MP_NOPTS_VALUE; d_audio->pts_offset = 0; if (d_audio->ad_driver) - d_audio->ad_driver->control(d_audio, ADCTRL_RESYNC_STREAM, NULL); + d_audio->ad_driver->control(d_audio, ADCTRL_RESET, NULL); } -- cgit v1.2.3