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
cec52bce
Commit
cec52bce
authored
Oct 04, 2006
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* forward port my fixed temporary fix and re-enable x264 in the contribs
parent
9d7bec36
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+1
-4
modules/codec/x264.c
modules/codec/x264.c
+5
-0
No files found.
extras/contrib/src/Makefile
View file @
cec52bce
...
@@ -145,13 +145,10 @@ ifdef HAVE_DARWIN_OS
...
@@ -145,13 +145,10 @@ ifdef HAVE_DARWIN_OS
.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod
\
.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod
\
.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image
\
.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image
\
.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal
\
.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal
\
.libdca .tag .goom2k4
.libdca .tag .
x264 .
goom2k4
# .expat .clinkcc don't work with SDK yet
# .expat .clinkcc don't work with SDK yet
# .glib .libidl .gecko are required to build the mozilla plugin
# .glib .libidl .gecko are required to build the mozilla plugin
# .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
# .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
ifneq
($(HOST),i686-apple-darwin8)
all
:
.x264
endif
else
else
ifdef
HAVE_BEOS
ifdef
HAVE_BEOS
...
...
modules/codec/x264.c
View file @
cec52bce
...
@@ -534,8 +534,13 @@ vlc_module_begin();
...
@@ -534,8 +534,13 @@ vlc_module_begin();
/* Input/Output */
/* Input/Output */
#if defined(__DARWIN__) && defined(__INTEL__)
add_bool
(
SOUT_CFG_PREFIX
"asm"
,
0
,
NULL
,
ASM_TEXT
,
ASM_LONGTEXT
,
VLC_FALSE
);
#else
add_bool
(
SOUT_CFG_PREFIX
"asm"
,
1
,
NULL
,
ASM_TEXT
,
add_bool
(
SOUT_CFG_PREFIX
"asm"
,
1
,
NULL
,
ASM_TEXT
,
ASM_LONGTEXT
,
VLC_FALSE
);
ASM_LONGTEXT
,
VLC_FALSE
);
#endif
/* x264 psnr = 1 (default). disable PSNR computation for speed. */
/* x264 psnr = 1 (default). disable PSNR computation for speed. */
add_bool
(
SOUT_CFG_PREFIX
"psnr"
,
0
,
NULL
,
PSNR_TEXT
,
add_bool
(
SOUT_CFG_PREFIX
"psnr"
,
0
,
NULL
,
PSNR_TEXT
,
...
...
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