Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
00dba0cc
Commit
00dba0cc
authored
Oct 28, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move libavutil define to avcommon.h
parent
635abd7f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
modules/codec/avcodec/avcodec.h
modules/codec/avcodec/avcodec.h
+0
-4
modules/codec/avcodec/avcommon.h
modules/codec/avcodec/avcommon.h
+5
-1
No files found.
modules/codec/avcodec/avcodec.h
View file @
00dba0cc
...
...
@@ -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
...
...
modules/codec/avcodec/avcommon.h
View file @
00dba0cc
/*****************************************************************************
* av
init.h: common code for libav* initialization
* av
common.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} ."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment