summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorRudolf Polzer <divverent@xonotic.org>2012-12-13 12:58:16 +0100
committerRudolf Polzer <divverent@xonotic.org>2012-12-13 12:58:16 +0100
commit925c3af9280cb23f00a5ca4c19e8f2331a23ff89 (patch)
tree04b8625778cb883a7b3f1a20e7a185dc95fa99c9 /audio
parent61aef3fff983416b06d7141bea5d75ec63b32bb9 (diff)
downloadmpv-925c3af9280cb23f00a5ca4c19e8f2331a23ff89.tar.bz2
mpv-925c3af9280cb23f00a5ca4c19e8f2331a23ff89.tar.xz
ao_lavc: stop using av_get_alt_sample_fmt
Use av_get_planar_sample_fmt instead.
Diffstat (limited to 'audio')
-rw-r--r--audio/out/ao_lavc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index 0a648e1b6b..470eebe8a0 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -219,22 +219,22 @@ out_takefirst:
ac->planarize = false;
{
bool found_format = false;
- bool found_alternate_format = false;
+ bool found_planar_format = false;
for (sampleformat = codec->sample_fmts;
sampleformat && *sampleformat != AV_SAMPLE_FMT_NONE;
++sampleformat) {
if (*sampleformat == ac->stream->codec->sample_fmt)
found_format = true;
if (*sampleformat ==
- av_get_alt_sample_fmt(ac->stream->codec->sample_fmt, 1))
- found_alternate_format = true;
+ av_get_planar_sample_fmt(ac->stream->codec->sample_fmt))
+ found_planar_format = true;
}
- if (!found_format && found_alternate_format) {
+ if (!found_format && found_planar_format) {
ac->stream->codec->sample_fmt =
- av_get_alt_sample_fmt(ac->stream->codec->sample_fmt, 1);
+ av_get_planar_sample_fmt(ac->stream->codec->sample_fmt);
ac->planarize = true;
}
- if (!found_format && !found_alternate_format) {
+ if (!found_format && !found_planar_format) {
// shouldn't happen
mp_msg(MSGT_ENCODE, MSGL_ERR,
"ao-lavc: sample format not found\n");