RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Fix trac ticket #1139, regression introduced in 8c1fb50d07.
This commit is contained in:
Stefano Sabatini 2012-03-29 00:17:23 +02:00
parent 1a06d6dd86
commit 95ce0ddcfe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_fade.c
View File

@ -192,9 +192,9 @@ static int config_props(AVFilterLink *inlink)
fade->alpha = fade->alpha ? ff_fmt_is_in(inlink->format, alpha_pix_fmts) : 0; fade->alpha = fade->alpha ? ff_fmt_is_in(inlink->format, alpha_pix_fmts) : 0;
fade->is_packed_rgb = ff_fill_rgba_map(fade->rgba_map, inlink->format) >= 0; fade->is_packed_rgb = ff_fill_rgba_map(fade->rgba_map, inlink->format) >= 0;
/* CCIR601/709 black level unless input is RGB or has alpha */ /* use CCIR601/709 black level for studio-level pixel non-alpha components */
fade->black_level = fade->black_level =
ff_fmt_is_in(inlink->format, studio_level_pix_fmts) || fade->alpha ? 0 : 16; ff_fmt_is_in(inlink->format, studio_level_pix_fmts) && !fade->alpha ? 16 : 0;
/* 32768 = 1 << 15, it is an integer representation /* 32768 = 1 << 15, it is an integer representation
* of 0.5 and is for rounding. */ * of 0.5 and is for rounding. */
fade->black_level_scaled = (fade->black_level << 16) + 32768; fade->black_level_scaled = (fade->black_level << 16) + 32768;