summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-12-23 18:12:29 +0100
committerwm4 <wm4@nowhere>2016-12-23 18:12:29 +0100
commit9d21f2503f28a7be0e493ab18a4acbaae02c3d0a (patch)
tree8a636fae2155338bf4ee2534a846ce92dd1808ef /audio
parentc560f6ff0ab9aec70e53a268e2ff388a85ec3ca0 (diff)
downloadmpv-9d21f2503f28a7be0e493ab18a4acbaae02c3d0a.tar.bz2
mpv-9d21f2503f28a7be0e493ab18a4acbaae02c3d0a.tar.xz
options: deprecate codec family selection in --vd/--ad
Useless now, so get rid of it. Also affects some user-visible display things (like reported codec in use).
Diffstat (limited to 'audio')
-rw-r--r--audio/decode/dec_audio.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index c98d42f556..9f28302bd5 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -91,7 +91,7 @@ static struct mp_decoder_list *audio_select_decoders(struct dec_audio *d_audio)
struct mp_decoder_list *list = audio_decoder_list();
struct mp_decoder_list *new =
- mp_select_decoders(list, codec, opts->audio_decoders);
+ mp_select_decoders(d_audio->log, list, codec, opts->audio_decoders);
if (d_audio->try_spdif && codec) {
struct mp_decoder_list *spdif =
select_spdif_codec(codec, opts->audio_spdif);
@@ -129,21 +129,18 @@ int audio_init_best_codec(struct dec_audio *d_audio)
const struct ad_functions *driver = find_driver(sel->family);
if (!driver)
continue;
- MP_VERBOSE(d_audio, "Opening audio decoder %s:%s\n",
- sel->family, sel->decoder);
+ MP_VERBOSE(d_audio, "Opening audio decoder %s\n", sel->decoder);
d_audio->ad_driver = driver;
if (init_audio_codec(d_audio, sel->decoder)) {
decoder = sel;
break;
}
- MP_WARN(d_audio, "Audio decoder init failed for "
- "%s:%s\n", sel->family, sel->decoder);
+ MP_WARN(d_audio, "Audio decoder init failed for %s\n", sel->decoder);
}
if (d_audio->ad_driver) {
d_audio->decoder_desc =
- talloc_asprintf(d_audio, "%s [%s:%s]", decoder->desc, decoder->family,
- decoder->decoder);
+ talloc_asprintf(d_audio, "%s (%s)", decoder->decoder, decoder->desc);
MP_VERBOSE(d_audio, "Selected audio codec: %s\n", d_audio->decoder_desc);
} else {
MP_ERR(d_audio, "Failed to initialize an audio decoder for codec '%s'.\n",