Browse code

lavfi/fade: fix black level for non studio-level pixel formats

Fix trac ticket #1139, regression introduced in 8c1fb50d077d5f954.

Stefano Sabatini authored on 2012/03/29 07:17:23
Showing 1 changed files
... ...
@@ -192,9 +192,9 @@ static int config_props(AVFilterLink *inlink)
192 192
     fade->alpha = fade->alpha ? ff_fmt_is_in(inlink->format, alpha_pix_fmts) : 0;
193 193
     fade->is_packed_rgb = ff_fill_rgba_map(fade->rgba_map, inlink->format) >= 0;
194 194
 
195
-    /* CCIR601/709 black level unless input is RGB or has alpha */
195
+    /* use CCIR601/709 black level for studio-level pixel non-alpha components */
196 196
     fade->black_level =
197
-            ff_fmt_is_in(inlink->format, studio_level_pix_fmts) || fade->alpha ? 0 : 16;
197
+            ff_fmt_is_in(inlink->format, studio_level_pix_fmts) && !fade->alpha ? 16 : 0;
198 198
     /* 32768 = 1 << 15, it is an integer representation
199 199
      * of 0.5 and is for rounding. */
200 200
     fade->black_level_scaled = (fade->black_level << 16) + 32768;