Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
635abd7f
Commit
635abd7f
authored
Oct 28, 2012
by
Rafaël Carré
Browse files
avcodec: AV_CPU_FLAG_MMX2 was removed
parent
58b9244d
Changes
2
Show whitespace changes
Inline
Side-by-side
modules/codec/avcodec/avcodec.h
View file @
635abd7f
...
@@ -307,6 +307,10 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
...
@@ -307,6 +307,10 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
# define AV_CPU_FLAG_ALTIVEC FF_MM_ALTIVEC
# define AV_CPU_FLAG_ALTIVEC FF_MM_ALTIVEC
#endif
#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
#if LIBAVCODEC_VERSION_MAJOR < 54
# define AV_PICTURE_TYPE_B FF_B_TYPE
# define AV_PICTURE_TYPE_B FF_B_TYPE
# define AV_PICTURE_TYPE_I FF_I_TYPE
# define AV_PICTURE_TYPE_I FF_I_TYPE
...
...
modules/codec/avcodec/cpu.c
View file @
635abd7f
...
@@ -40,7 +40,7 @@ unsigned GetVlcDspMask( void )
...
@@ -40,7 +40,7 @@ unsigned GetVlcDspMask( void )
if
(
!
vlc_CPU_MMX
()
)
if
(
!
vlc_CPU_MMX
()
)
mask
|=
AV_CPU_FLAG_MMX
;
mask
|=
AV_CPU_FLAG_MMX
;
if
(
!
vlc_CPU_MMXEXT
()
)
if
(
!
vlc_CPU_MMXEXT
()
)
mask
|=
AV_CPU_FLAG_MMX
2
;
mask
|=
AV_CPU_FLAG_MMX
EXT
;
if
(
!
vlc_CPU_3dNOW
()
)
if
(
!
vlc_CPU_3dNOW
()
)
mask
|=
AV_CPU_FLAG_3DNOW
;
mask
|=
AV_CPU_FLAG_3DNOW
;
if
(
!
vlc_CPU_SSE
()
)
if
(
!
vlc_CPU_SSE
()
)
...
...
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