From d701b7bcfa1f7344f3bed50a22bcfcc302c2cbc7 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Wed, 22 Dec 2004 01:23:15 +0000 Subject: [PATCH] * ffmpeg/encoder.c: if p_codec->pix_ftms is not yet available in this version of ffmpeg, then we just pray...? At least now it compiles again. Gildas, could you check if this is correct please? --- modules/codec/ffmpeg/encoder.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c index 0ced6b9108..ab8b673154 100644 --- a/modules/codec/ffmpeg/encoder.c +++ b/modules/codec/ffmpeg/encoder.c @@ -362,6 +362,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) p_enc->fmt_in.i_codec = VLC_FOURCC('I','4','2','0'); p_context->pix_fmt = E_(GetFfmpegChroma)( p_enc->fmt_in.i_codec ); +#if LIBAVCODEC_BUILD >= 4714 if( p_codec->pix_fmts ) { const enum PixelFormat *p = p_codec->pix_fmts; @@ -372,6 +373,9 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) if( *p == -1 ) p_context->pix_fmt = p_codec->pix_fmts[0]; p_enc->fmt_in.i_codec = E_(GetVlcChroma)( p_context->pix_fmt ); } +#else + p_enc->fmt_in.i_codec = E_(GetVlcChroma)( p_context->pix_fmt ); +#endif if ( p_sys->b_strict_rc ) { -- GitLab