From 4e91cb72ef926e6a7276c15f6a24549ff62afba8 Mon Sep 17 00:00:00 2001 From: Tom Yan Date: Mon, 16 Jul 2018 01:17:39 +0800 Subject: audio/format: minor fix for af_fmt_from_planar See af_fmt_to_planar. --- audio/format.c | 6 ++++-- 1 file 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) -- cgit v1.2.3