Commit 00dba0cc authored by Rafaël Carré's avatar Rafaël Carré
Browse files

Move libavutil define to avcommon.h

parent 635abd7f
......@@ -307,10 +307,6 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
# define AV_CPU_FLAG_ALTIVEC FF_MM_ALTIVEC
#endif
#if LIBAVUTIL_VERSION_MAJOR < 52 && !defined(AV_CPU_FLAG_MMXEXT)
# define AV_CPU_FLAG_MMXEXT AV_CPU_FLAG_MMX2
#endif
#if LIBAVCODEC_VERSION_MAJOR < 54
# define AV_PICTURE_TYPE_B FF_B_TYPE
# define AV_PICTURE_TYPE_I FF_I_TYPE
......
/*****************************************************************************
* avinit.h: common code for libav* initialization
* avcommon.h: common code for libav*
*****************************************************************************
* Copyright (C) 2012 the VideoLAN team
* $Id$
......@@ -68,6 +68,10 @@ static inline void vlc_init_avcodec(void)
# include <libavutil/avutil.h>
# include <libavutil/dict.h>
#if LIBAVUTIL_VERSION_MAJOR < 52 && !defined(AV_CPU_FLAG_MMXEXT)
# define AV_CPU_FLAG_MMXEXT AV_CPU_FLAG_MMX2
#endif
#define AV_OPTIONS_TEXT "Advanced options."
#define AV_OPTIONS_LONGTEXT "Advanced options, in the form {opt=val,opt2=val2} ."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment