summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-01-19 22:47:18 +0100
committerwm4 <wm4@nowhere>2016-01-19 22:49:05 +0100
commitaaafbfcc06a8e69bca78641af70f43b2ad12e56a (patch)
treeaa277248b3590c0d81ed0142394d07a7ac5bd2d1 /audio
parent30031edce3bb79051a125183c8dc152ba4e78e66 (diff)
downloadmpv-aaafbfcc06a8e69bca78641af70f43b2ad12e56a.tar.bz2
mpv-aaafbfcc06a8e69bca78641af70f43b2ad12e56a.tar.xz
audio: remove initial decoding retry limitation
Seems useless. This only helped in one case: one audio stream in the sample av_find_best_stream_fails.ts had a AC3 packets which couldn't be decoded, and for which avcodec_decode_audio4() returned 0 forever. In this specific case, playback will now not start, and you have to deselect audio manually. (If someone complains, the old behavior might be restored, but differently.) Also remove the stale "bitrate" field.
Diffstat (limited to 'audio')
-rw-r--r--audio/decode/dec_audio.h3
1 files changed, 0 insertions, 3 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