[FFmpeg-soc] [soc]: r5821 - libavfilter/vf_overlay.c

[Stefano Sabatini]

On date Friday 2010-06-04 22:15:35 +0200, bcoudurier encoded:
> Author: bcoudurier
> Date: Fri Jun  4 22:15:35 2010
> New Revision: 5821
> 
> Log:
> Direct rendering in overlay filter.
> RGB24 support.
> Doesn't work with movie in movie yet, needs loop input feature for logos
> either in movie filter or here.

This broke movie in movie.

Again, please *don't* make massive changes and introduce regressions
without not even posting and discussing the changes before, testing
with ffplay is a bonus.

Consider to fix the regression or revert the patch if you can't do it
in a reasonable amount of time, or at least try to justify because
this change should be an improvement over the previous behaviour.

> Modified:
>    libavfilter/vf_overlay.c
> 
> Modified: libavfilter/vf_overlay.c
> ==============================================================================
> --- libavfilter/vf_overlay.c	Fri Jun  4 22:10:23 2010	(r5820)
> +++ libavfilter/vf_overlay.c	Fri Jun  4 22:15:35 2010	(r5821)
> @@ -1,5 +1,6 @@
>  /*
>   * copyright (c) 2007 Bobby Bingham
> + * copyright (c) 2010 Baptiste Coudurier
>   *
>   * This file is part of FFmpeg.
>   *
> @@ -44,13 +45,9 @@ enum var_name {
>  };
>  
>  typedef struct {
> -    int x, y;                   //< position of subpicture
> +    unsigned x, y;              //< position of subpicture
>  
> -    /** pics[0][0..1] are pictures for the main image.
> -     *  pics[1][0..1] are pictures for the sub image.
> -     *  pics[x][0]    are previously outputted images.
> -     *  pics[x][1]    are queued, yet unused frames for each input. */
> -    AVFilterPicRef *pics[2][2];
> +    AVFilterPicRef *overlay;
>  
>      int bpp;                    //< bytes per pixel

bpp (whose name and documentation was just wrong) is not used anymore.

Regards.