summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/decode/dec_audio.h3
-rw-r--r--player/audio.c8
2 files changed, 0 insertions, 11 deletions
diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h
index b273bb2af9..d88d8bfaea 100644
--- a/audio/decode/dec_audio.h
+++ b/audio/decode/dec_audio.h
@@ -35,11 +35,8 @@ struct dec_audio {
struct sh_stream *header;
struct af_stream *afilter;
char *decoder_desc;
- int init_retries;
struct mp_audio decode_format;
struct mp_audio *waiting; // used on format-change
- // set by decoder
- int bitrate; // input bitrate, can change with VBR sources
// last known pts value in output from decoder
double pts;
// number of samples output by decoder after last known pts
diff --git a/player/audio.c b/player/audio.c
index d4b4d97f49..5a62a69d1a 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -531,14 +531,6 @@ void fill_audio_out_buffers(struct MPContext *mpctx, double endpts)
int r = initial_audio_decode(mpctx->d_audio);
if (r == AD_WAIT)
return; // continue later when new data is available
- if (r != AD_OK) {
- mpctx->d_audio->init_retries += 1;
- if (mpctx->d_audio->init_retries >= 50) {
- MP_ERR(mpctx, "Error initializing audio.\n");
- error_on_track(mpctx, mpctx->current_track[0][STREAM_AUDIO]);
- return;
- }
- }
reinit_audio_chain(mpctx);
mpctx->sleeptime = 0;
return; // try again next iteration