[FFmpeg-soc] [soc]: r1907 - in libavfilter: Makefile allfilters.c

[Vitor Sessak]

Hi, and thanks for having a look at it

Aurelien Jacobs wrote:
> On Tue, 12 Feb 2008 21:51:02 +0100 (CET)
> vitor <subversion at mplayerhq.hu> wrote:
> 
>> Author: vitor
>> Date: Tue Feb 12 21:51:02 2008
>> New Revision: 1907
>>
>> Log:
>> Fix compilation of vsrc_movie
>>
>> Modified:
>>    libavfilter/Makefile
>>    libavfilter/allfilters.c
>>
>> Modified: libavfilter/Makefile
>> ==============================================================================
>> --- libavfilter/Makefile	(original)
>> +++ libavfilter/Makefile	Tue Feb 12 21:51:02 2008
>> @@ -17,6 +17,7 @@ OBJS-$(CONFIG_VF_CROP)       += vf_crop.
>>  OBJS-$(CONFIG_VF_FPS)        += vf_fps.o
>>  OBJS-$(CONFIG_VF_HFLIP)      += vf_hflip.o
>>  OBJS-$(CONFIG_VF_NEGATE)     += vf_negate.o
>> +OBJS-$(CONFIG_VF_FIFO)       += vf_fifo.o
>>  OBJS-$(CONFIG_VF_FORMAT)     += vf_format.o
>>  OBJS-$(CONFIG_VF_OVERLAY)    += vf_overlay.o
>>  OBJS-$(CONFIG_VF_ROTATE)     += vf_rotate.o
> 
> Seems unrelated to the commit message.

Indeed. It was semi-accidental (it was supposed to be two separated 
commits).

> 
>> Modified: libavfilter/allfilters.c
>> ==============================================================================
>> --- libavfilter/allfilters.c	(original)
>> +++ libavfilter/allfilters.c	Tue Feb 12 21:51:02 2008
>> @@ -57,5 +57,6 @@ void avfilter_register_all(void)
>>      REGISTER_VF(TRANSPOSE,transpose);
>>      REGISTER_VF(VFLIP,vflip);
>>  
>> -    REGISTER_VSRC(MOVIE,movie);
>> +    if (ENABLE_AVFILTER_LAVF)
>> +        REGISTER_VSRC(MOVIE,movie);
> 
> It's not very nice, and IMO, not needed.
> I think ENABLE_VSRC_MOVIE should never be true when
> ENABLE_AVFILTER_LAVF is not true. Else, there is a
> bug in the configure script.

I agree. Changed.

-Vitor