diff options
author | Tom Yan <tom.ty89@gmail.com> | 2018-07-16 01:17:39 +0800 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2018-09-29 22:22:20 +0300 |
commit | 876341417addfc46efc227a9fb6332b308c7fa08 (patch) | |
tree | 24752541ae61affbe69f259061bd558c81700458 | |
parent | 6a57e1a29830b36fd08ae6318aec08c17a3fdc4a (diff) | |
download | mpv-876341417addfc46efc227a9fb6332b308c7fa08.tar.bz2 mpv-876341417addfc46efc227a9fb6332b308c7fa08.tar.xz |
audio/format: minor fix for af_fmt_from_planar
See af_fmt_to_planar.
(cherry picked from commit 4e91cb72ef926e6a7276c15f6a24549ff62afba8)
-rw-r--r-- | audio/format.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/audio/format.c b/audio/format.c index 8a13698ff7..7004409d10 100644 --- a/audio/format.c +++ b/audio/format.c @@ -95,14 +95,16 @@ int af_fmt_to_planar(int format) // Return the interleaved format corresponding to the given format. // If the format is already interleaved, return it. -// Always succeeds if format is actually planar; otherwise return 0. +// Return 0 if there's no equivalent. int af_fmt_from_planar(int format) { for (int n = 0; n < MP_ARRAY_SIZE(planar_formats); n++) { if (planar_formats[n][0] == format) return planar_formats[n][1]; + if (planar_formats[n][1] == format) + return format; } - return format; + return 0; } bool af_fmt_is_valid(int format) |