vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Mar 9 12:36:47 2013 +0200| [0babd21eadc353496df7a03d76063a4124539d5c] | committer: Rémi Denis-Courmont
avcodec: remove obsolete compatibility stuff > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0babd21eadc353496df7a03d76063a4124539d5c --- modules/codec/avcodec/avcodec.h | 27 +-------------------------- modules/stream_out/switcher.c | 5 ----- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h index 97494bb..3785f06 100644 --- a/modules/codec/avcodec/avcodec.h +++ b/modules/codec/avcodec/avcodec.h @@ -285,26 +285,6 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ); (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) -/* Ugly ifdefinitions to provide backwards compatibility with older ffmpeg/libav - * versions */ -#ifndef AV_CPU_FLAG_FORCE -# define AV_CPU_FLAG_FORCE FF_MM_FORCE -# define AV_CPU_FLAG_MMX FF_MM_MMX -# define AV_CPU_FLAG_3DNOW FF_MM_3DNOW -# define AV_CPU_FLAG_MMX2 FF_MM_MMX2 -# define AV_CPU_FLAG_SSE FF_MM_SSE -# define AV_CPU_FLAG_SSE2 FF_MM_SSE2 -# define AV_CPU_FLAG_SSE2SLOW FF_MM_SSE2SLOW -# define AV_CPU_FLAG_3DNOWEXT FF_MM_3DNOWEXT -# define AV_CPU_FLAG_SSE3 FF_MM_SSE3 -# define AV_CPU_FLAG_SSE3SLOW FF_MM_SSE3SLOW -# define AV_CPU_FLAG_SSSE3 FF_MM_SSSE3 -# define AV_CPU_FLAG_SSE4 FF_MM_SSE4 -# define AV_CPU_FLAG_SSE42 FF_MM_SSE42 -# define AV_CPU_FLAG_IWMMXT FF_MM_IWMMXT -# define AV_CPU_FLAG_ALTIVEC FF_MM_ALTIVEC -#endif - #if LIBAVCODEC_VERSION_MAJOR < 54 # define AV_PICTURE_TYPE_B FF_B_TYPE # define AV_PICTURE_TYPE_I FF_I_TYPE @@ -378,9 +358,4 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ); # define AV_CH_STEREO_RIGHT CH_STEREO_RIGHT #endif - -#endif - -#ifndef AV_PKT_FLAG_KEY -# define AV_PKT_FLAG_KEY PKT_FLAG_KEY -#endif +#endif /* LIBAVCODEC_VERSION_MAJOR < 54 */ diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c index 1aa686b..8e240ef 100644 --- a/modules/stream_out/switcher.c +++ b/modules/stream_out/switcher.c @@ -776,13 +776,8 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id ) i_aspect_num * (int64_t)id->ff_enc_c->height, i_aspect_den * (int64_t)id->ff_enc_c->width, 1 << 30 ); -#if LIBAVCODEC_BUILD >= 4754 id->ff_enc_c->time_base.num = 1; id->ff_enc_c->time_base.den = 25; /* FIXME */ -#else - id->ff_enc_c->frame_rate = 25; /* FIXME */ - id->ff_enc_c->frame_rate_base = 1; -#endif id->ff_enc_c->gop_size = 200; id->ff_enc_c->max_b_frames = 0; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
