diff options
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. |