virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

Merge commit '95c1df929b92d81454656c222a35ec5f7db576b4'

Browse Source 
* commit '95c1df929b92d81454656c222a35ec5f7db576b4':
  x86: hpeldsp: Drop unused function parameters

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-01-31 14:56:11 -03:00
commit f6005907fd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/x86/hpeldsp_init.c
View File

@ -184,7 +184,7 @@ HPELDSP_AVG_PIXELS16(_mmxext)
} while (0) } while (0)
#endif #endif
static void hpeldsp_init_mmx(HpelDSPContext *c, int flags, int cpu_flags) static void hpeldsp_init_mmx(HpelDSPContext *c, int flags)
{ {
SET_HPEL_FUNCS(put, [0], 16, mmx); SET_HPEL_FUNCS(put, [0], 16, mmx);
SET_HPEL_FUNCS(put_no_rnd, [0], 16, mmx); SET_HPEL_FUNCS(put_no_rnd, [0], 16, mmx);
@ -202,7 +202,7 @@ static void hpeldsp_init_mmx(HpelDSPContext *c, int flags, int cpu_flags)
#endif #endif
} }
static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int cpu_flags) static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags)
{ {
#if HAVE_MMXEXT_EXTERNAL #if HAVE_MMXEXT_EXTERNAL
c->put_pixels_tab[0][1] = ff_put_pixels16_x2_mmxext; c->put_pixels_tab[0][1] = ff_put_pixels16_x2_mmxext;
@ -233,7 +233,7 @@ static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int cpu_flags)
#endif /* HAVE_MMXEXT_EXTERNAL */ #endif /* HAVE_MMXEXT_EXTERNAL */
} }
static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags, int cpu_flags) static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags)
{ {
#if HAVE_AMD3DNOW_EXTERNAL #if HAVE_AMD3DNOW_EXTERNAL
c->put_pixels_tab[0][1] = ff_put_pixels16_x2_3dnow; c->put_pixels_tab[0][1] = ff_put_pixels16_x2_3dnow;
@ -264,7 +264,7 @@ static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags, int cpu_flags)
#endif /* HAVE_AMD3DNOW_EXTERNAL */ #endif /* HAVE_AMD3DNOW_EXTERNAL */
} }
static void hpeldsp_init_sse2_fast(HpelDSPContext *c, int flags, int cpu_flags) static void hpeldsp_init_sse2_fast(HpelDSPContext *c, int flags)
{ {
#if HAVE_SSE2_EXTERNAL #if HAVE_SSE2_EXTERNAL
c->put_pixels_tab[0][0] = ff_put_pixels16_sse2; c->put_pixels_tab[0][0] = ff_put_pixels16_sse2;
@ -279,7 +279,7 @@ static void hpeldsp_init_sse2_fast(HpelDSPContext *c, int flags, int cpu_flags)
#endif /* HAVE_SSE2_EXTERNAL */ #endif /* HAVE_SSE2_EXTERNAL */
} }
static void hpeldsp_init_ssse3(HpelDSPContext *c, int flags, int cpu_flags) static void hpeldsp_init_ssse3(HpelDSPContext *c, int flags)
{ {
#if HAVE_SSSE3_EXTERNAL #if HAVE_SSSE3_EXTERNAL
c->put_pixels_tab[0][3] = ff_put_pixels16_xy2_ssse3; c->put_pixels_tab[0][3] = ff_put_pixels16_xy2_ssse3;
@ -294,19 +294,19 @@ av_cold void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags)
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (INLINE_MMX(cpu_flags)) if (INLINE_MMX(cpu_flags))
hpeldsp_init_mmx(c, flags, cpu_flags); hpeldsp_init_mmx(c, flags);
if (EXTERNAL_AMD3DNOW(cpu_flags)) if (EXTERNAL_AMD3DNOW(cpu_flags))
hpeldsp_init_3dnow(c, flags, cpu_flags); hpeldsp_init_3dnow(c, flags);
if (EXTERNAL_MMXEXT(cpu_flags)) if (EXTERNAL_MMXEXT(cpu_flags))
hpeldsp_init_mmxext(c, flags, cpu_flags); hpeldsp_init_mmxext(c, flags);
if (EXTERNAL_SSE2_FAST(cpu_flags)) if (EXTERNAL_SSE2_FAST(cpu_flags))
hpeldsp_init_sse2_fast(c, flags, cpu_flags); hpeldsp_init_sse2_fast(c, flags);
if (EXTERNAL_SSSE3(cpu_flags)) if (EXTERNAL_SSSE3(cpu_flags))
hpeldsp_init_ssse3(c, flags, cpu_flags); hpeldsp_init_ssse3(c, flags);
if (CONFIG_VP3_DECODER) if (CONFIG_VP3_DECODER)
ff_hpeldsp_vp3_init_x86(c, cpu_flags, flags); ff_hpeldsp_vp3_init_x86(c, cpu_flags, flags);