[vlc-devel] commit: Fix regression on zvbi.c introduced by recent ffmpeg changes. ( Jean-Paul Saman )

[Jean-Paul Saman]

Måns Rullgård wrote:
> git at videolan.org (git version control) writes:
> 
>> vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Tue Mar 11 12:42:10 2008 +0100| [c61c53902842e81d059fde16e113c8d840207892]
>>
>> Fix regression on zvbi.c introduced by recent ffmpeg changes.
>>
>>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c61c53902842e81d059fde16e113c8d840207892
>> ---
>>
>>  modules/codec/zvbi.c |   12 ++++++------
>>  1 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
>> index a9a5601..e1dccc7 100644
>> --- a/modules/codec/zvbi.c
>> +++ b/modules/codec/zvbi.c
>> @@ -136,7 +136,7 @@ struct decoder_sys_t
>>      int                     i_align;
>>
>>      /* Misc */
>> -#if defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H)
>> +#if defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H)
> 
> This doesn't look right.
> 

Oops you are right

Gtz
Jean-Paul Saman.