Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
9a22e6fa
Commit
9a22e6fa
authored
Nov 17, 2018
by
Martin Vignali
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/proresdsp indent after prev commit
parent
c097a32e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
proresdsp.c
libavcodec/proresdsp.c
+2
-2
proresdsp_init.c
libavcodec/x86/proresdsp_init.c
+8
-8
No files found.
libavcodec/proresdsp.c
View file @
9a22e6fa
...
...
@@ -57,8 +57,8 @@ static void prores_idct_put_10_c(uint16_t *out, ptrdiff_t linesize, int16_t *blo
av_cold
int
ff_proresdsp_init
(
ProresDSPContext
*
dsp
,
AVCodecContext
*
avctx
)
{
if
(
avctx
->
bits_per_raw_sample
==
10
)
{
dsp
->
idct_put
=
prores_idct_put_10_c
;
dsp
->
idct_permutation_type
=
FF_IDCT_PERM_NONE
;
dsp
->
idct_put
=
prores_idct_put_10_c
;
dsp
->
idct_permutation_type
=
FF_IDCT_PERM_NONE
;
}
else
{
return
AVERROR_BUG
;
}
...
...
libavcodec/x86/proresdsp_init.c
View file @
9a22e6fa
...
...
@@ -36,15 +36,15 @@ av_cold void ff_proresdsp_init_x86(ProresDSPContext *dsp, AVCodecContext *avctx)
int
cpu_flags
=
av_get_cpu_flags
();
if
(
avctx
->
bits_per_raw_sample
==
10
){
if
(
EXTERNAL_SSE2
(
cpu_flags
))
{
dsp
->
idct_permutation_type
=
FF_IDCT_PERM_TRANSPOSE
;
dsp
->
idct_put
=
ff_prores_idct_put_10_sse2
;
}
if
(
EXTERNAL_SSE2
(
cpu_flags
))
{
dsp
->
idct_permutation_type
=
FF_IDCT_PERM_TRANSPOSE
;
dsp
->
idct_put
=
ff_prores_idct_put_10_sse2
;
}
if
(
EXTERNAL_AVX
(
cpu_flags
))
{
dsp
->
idct_permutation_type
=
FF_IDCT_PERM_TRANSPOSE
;
dsp
->
idct_put
=
ff_prores_idct_put_10_avx
;
}
if
(
EXTERNAL_AVX
(
cpu_flags
))
{
dsp
->
idct_permutation_type
=
FF_IDCT_PERM_TRANSPOSE
;
dsp
->
idct_put
=
ff_prores_idct_put_10_avx
;
}
}
#endif
/* ARCH_X86_64 */
}
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