Commit 1f27053b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'de27d2b9'

* commit 'de27d2b9':
  lavc: remove disabled FF_API_LIBMPEG2 cruft

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d3edc65d de27d2b9
...@@ -2509,7 +2509,6 @@ typedef struct AVCodecContext { ...@@ -2509,7 +2509,6 @@ typedef struct AVCodecContext {
#define FF_IDCT_INT 1 #define FF_IDCT_INT 1
#define FF_IDCT_SIMPLE 2 #define FF_IDCT_SIMPLE 2
#define FF_IDCT_SIMPLEMMX 3 #define FF_IDCT_SIMPLEMMX 3
#define FF_IDCT_LIBMPEG2MMX 4
#if FF_API_MMI #if FF_API_MMI
#define FF_IDCT_MMI 5 #define FF_IDCT_MMI 5
#endif #endif
......
...@@ -49,9 +49,6 @@ ...@@ -49,9 +49,6 @@
#undef printf #undef printf
void ff_mmx_idct(int16_t *data);
void ff_mmxext_idct(int16_t *data);
// BFIN // BFIN
void ff_bfin_idct(int16_t *block); void ff_bfin_idct(int16_t *block);
void ff_bfin_fdct(int16_t *block); void ff_bfin_fdct(int16_t *block);
...@@ -126,10 +123,6 @@ static const struct algo idct_tab[] = { ...@@ -126,10 +123,6 @@ static const struct algo idct_tab[] = {
{ "SIMPLE-C", ff_simple_idct_8, NO_PERM }, { "SIMPLE-C", ff_simple_idct_8, NO_PERM },
#if HAVE_MMX_INLINE #if HAVE_MMX_INLINE
#if CONFIG_GPL
{ "LIBMPEG2-MMX", ff_mmx_idct, MMX_PERM, AV_CPU_FLAG_MMX, 1 },
{ "LIBMPEG2-MMX2", ff_mmxext_idct, MMX_PERM, AV_CPU_FLAG_MMX2, 1 },
#endif
{ "SIMPLE-MMX", ff_simple_idct_mmx, MMX_SIMPLE_PERM, AV_CPU_FLAG_MMX }, { "SIMPLE-MMX", ff_simple_idct_mmx, MMX_SIMPLE_PERM, AV_CPU_FLAG_MMX },
{ "XVID-MMX", ff_idct_xvid_mmx, NO_PERM, AV_CPU_FLAG_MMX, 1 }, { "XVID-MMX", ff_idct_xvid_mmx, NO_PERM, AV_CPU_FLAG_MMX, 1 },
{ "XVID-MMXEXT", ff_idct_xvid_mmxext, NO_PERM, AV_CPU_FLAG_MMXEXT, 1 }, { "XVID-MMXEXT", ff_idct_xvid_mmxext, NO_PERM, AV_CPU_FLAG_MMXEXT, 1 },
......
...@@ -189,7 +189,6 @@ static const AVOption options[]={ ...@@ -189,7 +189,6 @@ static const AVOption options[]={
{"int", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_INT }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"int", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_INT }, INT_MIN, INT_MAX, V|E|D, "idct"},
{"simple", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simple", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"},
{"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"},
{"libmpeg2mmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_LIBMPEG2MMX }, INT_MIN, INT_MAX, V|E|D, "idct"},
#if FF_API_MMI #if FF_API_MMI
{"mmi", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_MMI }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"mmi", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_MMI }, INT_MIN, INT_MAX, V|E|D, "idct"},
#endif #endif
......
...@@ -73,9 +73,6 @@ ...@@ -73,9 +73,6 @@
#ifndef FF_API_CODEC_ID #ifndef FF_API_CODEC_ID
#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_LIBMPEG2
#define FF_API_LIBMPEG2 (LIBAVCODEC_VERSION_MAJOR < 55)
#endif
#ifndef FF_API_MMI #ifndef FF_API_MMI
#define FF_API_MMI (LIBAVCODEC_VERSION_MAJOR < 55) #define FF_API_MMI (LIBAVCODEC_VERSION_MAJOR < 55)
#endif #endif
......
...@@ -6,9 +6,6 @@ OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o ...@@ -6,9 +6,6 @@ OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o
OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o
OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o
OBJS-$(CONFIG_FFT) += x86/fft_init.o OBJS-$(CONFIG_FFT) += x86/fft_init.o
ifdef CONFIG_GPL
OBJS-$(CONFIG_DSPUTIL) += x86/idct_mmx.o
endif
OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o
OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o
OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o
......
...@@ -1420,38 +1420,6 @@ void ff_avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride, ...@@ -1420,38 +1420,6 @@ void ff_avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride,
#endif #endif
#endif #endif
/* XXX: Those functions should be suppressed ASAP when all IDCTs are
* converted. */
#if CONFIG_GPL
static void ff_libmpeg2mmx_idct_put(uint8_t *dest, int line_size,
int16_t *block)
{
ff_mmx_idct(block);
ff_put_pixels_clamped_mmx(block, dest, line_size);
}
static void ff_libmpeg2mmx_idct_add(uint8_t *dest, int line_size,
int16_t *block)
{
ff_mmx_idct(block);
ff_add_pixels_clamped_mmx(block, dest, line_size);
}
static void ff_libmpeg2mmx2_idct_put(uint8_t *dest, int line_size,
int16_t *block)
{
ff_mmxext_idct(block);
ff_put_pixels_clamped_mmx(block, dest, line_size);
}
static void ff_libmpeg2mmx2_idct_add(uint8_t *dest, int line_size,
int16_t *block)
{
ff_mmxext_idct(block);
ff_add_pixels_clamped_mmx(block, dest, line_size);
}
#endif
static void vector_clipf_sse(float *dst, const float *src, static void vector_clipf_sse(float *dst, const float *src,
float min, float max, int len) float min, float max, int len)
{ {
...@@ -1821,19 +1789,6 @@ av_cold void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx) ...@@ -1821,19 +1789,6 @@ av_cold void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx)
c->idct_add = ff_simple_idct_add_mmx; c->idct_add = ff_simple_idct_add_mmx;
c->idct = ff_simple_idct_mmx; c->idct = ff_simple_idct_mmx;
c->idct_permutation_type = FF_SIMPLE_IDCT_PERM; c->idct_permutation_type = FF_SIMPLE_IDCT_PERM;
#if CONFIG_GPL
} else if (idct_algo == FF_IDCT_LIBMPEG2MMX) {
if (mm_flags & AV_CPU_FLAG_MMX2) {
c->idct_put = ff_libmpeg2mmx2_idct_put;
c->idct_add = ff_libmpeg2mmx2_idct_add;
c->idct = ff_mmxext_idct;
} else {
c->idct_put = ff_libmpeg2mmx_idct_put;
c->idct_add = ff_libmpeg2mmx_idct_add;
c->idct = ff_mmx_idct;
}
c->idct_permutation_type = FF_LIBMPEG2_IDCT_PERM;
#endif
} else if (idct_algo == FF_IDCT_XVIDMMX) { } else if (idct_algo == FF_IDCT_XVIDMMX) {
if (mm_flags & AV_CPU_FLAG_SSE2) { if (mm_flags & AV_CPU_FLAG_SSE2) {
c->idct_put = ff_idct_xvid_sse2_put; c->idct_put = ff_idct_xvid_sse2_put;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment