Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
64568cf4
Commit
64568cf4
authored
Sep 20, 2011
by
Konstantin Pavlov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Switcher: port to FFmpeg-0.8 API"
This reverts commit
d0dc1be9
.
parent
2bb2c48e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
40 deletions
+1
-40
modules/stream_out/switcher.c
modules/stream_out/switcher.c
+1
-40
No files found.
modules/stream_out/switcher.c
View file @
64568cf4
...
...
@@ -358,7 +358,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
/* Set CPU capabilities */
unsigned
i_cpu
=
vlc_CPU
();
id
->
ff_enc_c
->
dsp_mask
=
0
;
#if LIBAVCODEC_VERSION_MAJOR < 53
if
(
!
(
i_cpu
&
CPU_CAPABILITY_MMX
)
)
{
id
->
ff_enc_c
->
dsp_mask
|=
FF_MM_MMX
;
...
...
@@ -376,25 +375,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
id
->
ff_enc_c
->
dsp_mask
|=
FF_MM_SSE
;
id
->
ff_enc_c
->
dsp_mask
|=
FF_MM_SSE2
;
}
#else
if
(
!
(
i_cpu
&
CPU_CAPABILITY_MMX
)
)
{
id
->
ff_enc_c
->
dsp_mask
|=
AV_CPU_FLAG_MMX
;
}
if
(
!
(
i_cpu
&
CPU_CAPABILITY_MMXEXT
)
)
{
id
->
ff_enc_c
->
dsp_mask
|=
AV_CPU_FLAG_MMX2
;
}
if
(
!
(
i_cpu
&
CPU_CAPABILITY_3DNOW
)
)
{
id
->
ff_enc_c
->
dsp_mask
|=
AV_CPU_FLAG_3DNOW
;
}
if
(
!
(
i_cpu
&
CPU_CAPABILITY_SSE
)
)
{
id
->
ff_enc_c
->
dsp_mask
|=
AV_CPU_FLAG_SSE
;
id
->
ff_enc_c
->
dsp_mask
|=
AV_CPU_FLAG_SSE2
;
}
#endif
id
->
ff_enc_c
->
sample_rate
=
p_fmt
->
audio
.
i_rate
;
id
->
ff_enc_c
->
channels
=
p_fmt
->
audio
.
i_channels
;
id
->
ff_enc_c
->
bit_rate
=
p_fmt
->
i_bitrate
;
...
...
@@ -766,7 +747,6 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id )
/* Set CPU capabilities */
unsigned
i_cpu
=
vlc_CPU
();
id
->
ff_enc_c
->
dsp_mask
=
0
;
#if LIBAVCODEC_VERSION_MAJOR < 53
if
(
!
(
i_cpu
&
CPU_CAPABILITY_MMX
)
)
{
id
->
ff_enc_c
->
dsp_mask
|=
FF_MM_MMX
;
...
...
@@ -784,25 +764,6 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id )
id
->
ff_enc_c
->
dsp_mask
|=
FF_MM_SSE
;
id
->
ff_enc_c
->
dsp_mask
|=
FF_MM_SSE2
;
}
#else
if
(
!
(
i_cpu
&
CPU_CAPABILITY_MMX
)
)
{
id
->
ff_enc_c
->
dsp_mask
|=
AV_CPU_FLAG_MMX
;
}
if
(
!
(
i_cpu
&
CPU_CAPABILITY_MMXEXT
)
)
{
id
->
ff_enc_c
->
dsp_mask
|=
AV_CPU_FLAG_MMX2
;
}
if
(
!
(
i_cpu
&
CPU_CAPABILITY_3DNOW
)
)
{
id
->
ff_enc_c
->
dsp_mask
|=
AV_CPU_FLAG_3DNOW
;
}
if
(
!
(
i_cpu
&
CPU_CAPABILITY_SSE
)
)
{
id
->
ff_enc_c
->
dsp_mask
|=
AV_CPU_FLAG_SSE
;
id
->
ff_enc_c
->
dsp_mask
|=
AV_CPU_FLAG_SSE2
;
}
#endif
id
->
ff_enc_c
->
width
=
p_sys
->
p_pictures
[
p_sys
->
i_cmd
-
1
].
format
.
i_width
;
id
->
ff_enc_c
->
height
=
p_sys
->
p_pictures
[
p_sys
->
i_cmd
-
1
].
format
.
i_height
;
...
...
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