har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/proresdsp indent after prev commit

Browse Source
This commit is contained in:
Martin Vignali 2018-11-17 23:35:52 +01:00
parent c097a32e93
commit 9a22e6fa1d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/proresdsp.c
View File

@ -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) av_cold int ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx)
{ {
if (avctx->bits_per_raw_sample == 10) { if (avctx->bits_per_raw_sample == 10) {
dsp->idct_put = prores_idct_put_10_c; dsp->idct_put = prores_idct_put_10_c;
dsp->idct_permutation_type = FF_IDCT_PERM_NONE; dsp->idct_permutation_type = FF_IDCT_PERM_NONE;
} else { } else {
return AVERROR_BUG; return AVERROR_BUG;
} }

16
libavcodec/x86/proresdsp_init.c
View File

@ -36,15 +36,15 @@ av_cold void ff_proresdsp_init_x86(ProresDSPContext *dsp, AVCodecContext *avctx)
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (avctx->bits_per_raw_sample == 10){ if (avctx->bits_per_raw_sample == 10){
if (EXTERNAL_SSE2(cpu_flags)) { if (EXTERNAL_SSE2(cpu_flags)) {
dsp->idct_permutation_type = FF_IDCT_PERM_TRANSPOSE; dsp->idct_permutation_type = FF_IDCT_PERM_TRANSPOSE;
dsp->idct_put = ff_prores_idct_put_10_sse2; dsp->idct_put = ff_prores_idct_put_10_sse2;
} }
if (EXTERNAL_AVX(cpu_flags)) { if (EXTERNAL_AVX(cpu_flags)) {
dsp->idct_permutation_type = FF_IDCT_PERM_TRANSPOSE; dsp->idct_permutation_type = FF_IDCT_PERM_TRANSPOSE;
dsp->idct_put = ff_prores_idct_put_10_avx; dsp->idct_put = ff_prores_idct_put_10_avx;
} }
} }
#endif /* ARCH_X86_64 */ #endif /* ARCH_X86_64 */
} }