exr: s/bits_per_color_id/pixel_type

[ffmpeg] / libavfilter / formats.h

diff --git a/libavfilter/formats.h b/libavfilter/formats.h
index a476e70c2e57be7f843a591c00ee67dc333940ea..c06f6dfa3ca39696d693c19cbe267d057da232c3 100644 (file)
--- 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.