diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-02-21 14:02:13 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-02-24 11:58:52 +0100 |
| commit | 2d98dd3d142b5905852571a9c4c5d873945b2a37 (patch) | |
| tree | b951babb00a74f326f3b3be525dfc93a5fd8cb2f /libavfilter/formats.h | |
| parent | 3d7f4f87267cf260795f28de1f669c3f45e05a28 (diff) | |
| download | ffmpeg-2d98dd3d142b5905852571a9c4c5d873945b2a37.tar.gz | |
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.
Diffstat (limited to 'libavfilter/formats.h')
| -rw-r--r-- | libavfilter/formats.h | 3 |
1 files changed, 2 insertions, 1 deletions
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. |