From 2d98dd3d142b5905852571a9c4c5d873945b2a37 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Thu, 21 Feb 2013 14:02:13 +0100 Subject: lavfi: fix merging of formats and clarify exception. The following commit: b97d61f avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha introduced an exception to avoid lossy conversions. Add a comment to explain the logic. Fix the call to avoid applying it on audio formats. --- libavfilter/formats.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavfilter/formats.h') diff --git a/libavfilter/formats.h b/libavfilter/formats.h index a476e70c2e..c06f6dfa3c 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -218,7 +218,8 @@ AVFilterFormats *ff_planar_sample_fmts(void); * If a and b do not share any common formats, neither is modified, and NULL * is returned. */ -AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b); +AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b, + enum AVMediaType type); /** * Add *ref as a new reference to formats. -- cgit v1.2.3