[Ffmpeg-devel] [PATCH] watermark, exact color

[Corey Hickey]

Marcus Engene wrote:
> Hi,
> 
> My previous description was terrible since I was tired.
> 
> Due to user feedback I have added the possibility of watermarking with 
> exact colors.
> (The previous one only did "delta watermarking",
> ie watermark color - 0x80 was saturate added to frame color)

[cut]

>              default:
>                  av_log(NULL, AV_LOG_ERROR, "Watermark: Unrecognized argument '%s'\n", argv[optind]);
>                  return -1;
>          }
>      }
> -
> +    
>      //
>      if (0 == ci->filename[0]) {
>          av_log(NULL, AV_LOG_ERROR, "Watermark: There is no filename specified.\n");

Uh-oh, a whitespace cosmetic change. Other than that and a few other
trailing whitespaces... committed.

I also added you to the MAINTAINERS file, as per Michael's decree.

Thanks,
Corey