Search
j0ke.net Open Build Service
>
Projects
>
multimedia
>
vlc
> vlc-0.8.6i-ffmpeg.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File vlc-0.8.6i-ffmpeg.patch of Package vlc (Revision 56)
Currently displaying revision
56
,
show latest
--- modules/codec/ffmpeg/video.c.orig 2008-12-29 01:05:50.000000000 +0100 +++ modules/codec/ffmpeg/video.c 2008-12-29 01:08:17.000000000 +0100 @@ -259,13 +259,22 @@ p_sys->p_context->codec_tag = ffmpeg_CodecTag( p_dec->fmt_in.i_codec ); p_sys->p_context->width = p_dec->fmt_in.video.i_width; p_sys->p_context->height = p_dec->fmt_in.video.i_height; +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) p_sys->p_context->bits_per_sample = p_dec->fmt_in.video.i_bits_per_pixel; +#else + p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.video.i_bits_per_pixel; +#endif /* ***** Get configuration of ffmpeg plugin ***** */ p_sys->p_context->workaround_bugs = config_GetInt( p_dec, "ffmpeg-workaround-bugs" ); +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) p_sys->p_context->error_resilience = config_GetInt( p_dec, "ffmpeg-error-resilience" ); +#else + p_sys->p_context->error_recognition = + config_GetInt( p_dec, "ffmpeg-error-resilience" ); +#endif var_Create( p_dec, "grayscale", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Get( p_dec, "grayscale", &val ); --- modules/codec/ffmpeg/audio.c.orig 2008-12-29 01:26:11.000000000 +0100 +++ modules/codec/ffmpeg/audio.c 2008-12-29 01:27:15.000000000 +0100 @@ -111,7 +111,11 @@ p_sys->p_context->channels = p_dec->fmt_in.audio.i_channels; p_sys->p_context->block_align = p_dec->fmt_in.audio.i_blockalign; p_sys->p_context->bit_rate = p_dec->fmt_in.i_bitrate; +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) p_sys->p_context->bits_per_sample = p_dec->fmt_in.audio.i_bitspersample; +#else + p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.audio.i_bitspersample; +#endif if( ( p_sys->p_context->extradata_size = p_dec->fmt_in.i_extra ) > 0 ) { --- modules/codec/ffmpeg/chroma.c.orig 2008-12-29 09:18:30.000000000 +0100 +++ modules/codec/ffmpeg/chroma.c 2008-12-29 09:24:53.000000000 +0100 @@ -54,7 +54,6 @@ int i_dst_vlc_chroma; int i_dst_ffmpeg_chroma; AVPicture tmp_pic; - ImgReSampleContext *p_rsc; }; /*****************************************************************************