summaryrefslogtreecommitdiffstats
path: root/audio/audio.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-27 00:11:35 +0100
committerwm4 <wm4@nowhere>2013-11-27 00:16:05 +0100
commitaddfcf9ce339f487c94c36f6e72fc7e736586015 (patch)
tree0aa3a9b83ca5f203737573d12b4afb017fdb43a5 /audio/audio.h
parentce1a511e221b032acc863d86b8d5b1644af00445 (diff)
downloadmpv-addfcf9ce339f487c94c36f6e72fc7e736586015.tar.bz2
mpv-addfcf9ce339f487c94c36f6e72fc7e736586015.tar.xz
audio: better rejection of invalid formats
This includes the case when lavc decodes audio with more than 8 channels, which our audio chain currently does not support. the changes in ad_lavc.c are just simplifications. The code tried to avoid overriding global parameters if it found something invalid, but that is not needed anymore.
Diffstat (limited to 'audio/audio.h')
-rw-r--r--audio/audio.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/audio/audio.h b/audio/audio.h
index 54ac2d5aac..8dbdc4e710 100644
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -47,6 +47,7 @@ void mp_audio_set_channels_old(struct mp_audio *mpa, int num_channels);
void mp_audio_set_channels(struct mp_audio *mpa, const struct mp_chmap *chmap);
void mp_audio_copy_config(struct mp_audio *dst, const struct mp_audio *src);
bool mp_audio_config_equals(const struct mp_audio *a, const struct mp_audio *b);
+bool mp_audio_config_valid(const struct mp_audio *mpa);
char *mp_audio_fmt_to_str(int srate, const struct mp_chmap *chmap, int format);
char *mp_audio_config_to_str(struct mp_audio *mpa);