Re: [libav-devel] [PATCH] Remove deprecated XvMC support hacks

2016-12-07 Thread Diego Biurrun 
On Wed, Dec 07, 2016 at 04:14:10PM -0500, Vittorio Giovara wrote:
> On Wed, Dec 7, 2016 at 2:18 AM, Diego Biurrun  wrote:
> > Deprecated in 11/2013.
> > ---
> >
> > These are not the droids you are looking for.
> >
> >  configure |   3 -
> >  libavcodec/4xm.c  |   2 +-
> >  libavcodec/Makefile   |   3 -
> >  libavcodec/allcodecs.c|   3 -
> >  libavcodec/asvdec.c   |   2 +-
> >  libavcodec/avcodec.h  |  17 ---
> >  libavcodec/bink.c |   2 +-
> >  libavcodec/blockdsp.c |  10 +-
> >  libavcodec/blockdsp.h |  10 +-
> >  libavcodec/cavs.c |   2 +-
> >  libavcodec/codec_desc.c   |  11 +-
> >  libavcodec/dnxhddec.c |   2 +-
> >  libavcodec/dnxhdenc.c |   2 +-
> >  libavcodec/eamad.c|   2 +-
> >  libavcodec/eatqi.c|   2 +-
> >  libavcodec/error_resilience.c |  21 ---
> >  libavcodec/g2meet.c   |   2 +-
> >  libavcodec/intrax8.c  |   2 +-
> >  libavcodec/jvdec.c|   2 +-
> >  libavcodec/mdec.c |   2 +-
> >  libavcodec/mimic.c|   2 +-
> >  libavcodec/mjpegdec.c |   2 +-
> >  libavcodec/mpeg12dec.c| 103 -
> >  libavcodec/mpegvideo.c|  29 +---
> >  libavcodec/mpegvideo_xvmc.c   | 337 
> > --
> >  libavcodec/options_table.h|   3 -
> >  libavcodec/vc1dec.c   |   2 +-
> >  libavcodec/version.h  |   3 -
> >  libavcodec/wmv2.c |   2 +-
> >  libavcodec/x86/blockdsp.c |  16 +-
> >  libavcodec/xvmc.h | 174 --
> >  libavcodec/xvmc_internal.h|  38 -
> >  libavutil/pixdesc.c   |  10 --
> >  libavutil/pixfmt.h|   4 -
> >  libavutil/version.h   |   3 -
> >  tests/checkasm/blockdsp.c |   4 +-
> >  36 files changed, 25 insertions(+), 809 deletions(-)
> >  delete mode 100644 libavcodec/mpegvideo_xvmc.c
> >  delete mode 100644 libavcodec/xvmc.h
> >  delete mode 100644 libavcodec/xvmc_internal.h
> 
> well since you insist ;)

Notice how I also dropped the now-pointless extra function parameter
in blockdsp ;-p

> ok with me but if you don't mind we should use the same commit log
> template of the other ones.

I did AFAICT..

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH] Remove deprecated XvMC support hacks

2016-12-07 Thread Vittorio Giovara 
On Wed, Dec 7, 2016 at 2:18 AM, Diego Biurrun  wrote:
> Deprecated in 11/2013.
> ---
>
> These are not the droids you are looking for.
>
>  configure |   3 -
>  libavcodec/4xm.c  |   2 +-
>  libavcodec/Makefile   |   3 -
>  libavcodec/allcodecs.c|   3 -
>  libavcodec/asvdec.c   |   2 +-
>  libavcodec/avcodec.h  |  17 ---
>  libavcodec/bink.c |   2 +-
>  libavcodec/blockdsp.c |  10 +-
>  libavcodec/blockdsp.h |  10 +-
>  libavcodec/cavs.c |   2 +-
>  libavcodec/codec_desc.c   |  11 +-
>  libavcodec/dnxhddec.c |   2 +-
>  libavcodec/dnxhdenc.c |   2 +-
>  libavcodec/eamad.c|   2 +-
>  libavcodec/eatqi.c|   2 +-
>  libavcodec/error_resilience.c |  21 ---
>  libavcodec/g2meet.c   |   2 +-
>  libavcodec/intrax8.c  |   2 +-
>  libavcodec/jvdec.c|   2 +-
>  libavcodec/mdec.c |   2 +-
>  libavcodec/mimic.c|   2 +-
>  libavcodec/mjpegdec.c |   2 +-
>  libavcodec/mpeg12dec.c| 103 -
>  libavcodec/mpegvideo.c|  29 +---
>  libavcodec/mpegvideo_xvmc.c   | 337 
> --
>  libavcodec/options_table.h|   3 -
>  libavcodec/vc1dec.c   |   2 +-
>  libavcodec/version.h  |   3 -
>  libavcodec/wmv2.c |   2 +-
>  libavcodec/x86/blockdsp.c |  16 +-
>  libavcodec/xvmc.h | 174 --
>  libavcodec/xvmc_internal.h|  38 -
>  libavutil/pixdesc.c   |  10 --
>  libavutil/pixfmt.h|   4 -
>  libavutil/version.h   |   3 -
>  tests/checkasm/blockdsp.c |   4 +-
>  36 files changed, 25 insertions(+), 809 deletions(-)
>  delete mode 100644 libavcodec/mpegvideo_xvmc.c
>  delete mode 100644 libavcodec/xvmc.h
>  delete mode 100644 libavcodec/xvmc_internal.h

well since you insist ;)
ok with me but if you don't mind we should use the same commit log
template of the other ones.
-- 
Vittorio
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] Remove deprecated XvMC support hacks

2016-12-06 Thread Diego Biurrun 
Deprecated in 11/2013.
---

These are not the droids you are looking for.

 configure |   3 -
 libavcodec/4xm.c  |   2 +-
 libavcodec/Makefile   |   3 -
 libavcodec/allcodecs.c|   3 -
 libavcodec/asvdec.c   |   2 +-
 libavcodec/avcodec.h  |  17 ---
 libavcodec/bink.c |   2 +-
 libavcodec/blockdsp.c |  10 +-
 libavcodec/blockdsp.h |  10 +-
 libavcodec/cavs.c |   2 +-
 libavcodec/codec_desc.c   |  11 +-
 libavcodec/dnxhddec.c |   2 +-
 libavcodec/dnxhdenc.c |   2 +-
 libavcodec/eamad.c|   2 +-
 libavcodec/eatqi.c|   2 +-
 libavcodec/error_resilience.c |  21 ---
 libavcodec/g2meet.c   |   2 +-
 libavcodec/intrax8.c  |   2 +-
 libavcodec/jvdec.c|   2 +-
 libavcodec/mdec.c |   2 +-
 libavcodec/mimic.c|   2 +-
 libavcodec/mjpegdec.c |   2 +-
 libavcodec/mpeg12dec.c| 103 -
 libavcodec/mpegvideo.c|  29 +---
 libavcodec/mpegvideo_xvmc.c   | 337 --
 libavcodec/options_table.h|   3 -
 libavcodec/vc1dec.c   |   2 +-
 libavcodec/version.h  |   3 -
 libavcodec/wmv2.c |   2 +-
 libavcodec/x86/blockdsp.c |  16 +-
 libavcodec/xvmc.h | 174 --
 libavcodec/xvmc_internal.h|  38 -
 libavutil/pixdesc.c   |  10 --
 libavutil/pixfmt.h|   4 -
 libavutil/version.h   |   3 -
 tests/checkasm/blockdsp.c |   4 +-
 36 files changed, 25 insertions(+), 809 deletions(-)
 delete mode 100644 libavcodec/mpegvideo_xvmc.c
 delete mode 100644 libavcodec/xvmc.h
 delete mode 100644 libavcodec/xvmc_internal.h

diff --git a/configure b/configure
index 4c11e5e..cdc5cf0 100755
--- a/configure
+++ b/configure
@@ -2032,8 +2032,6 @@ mp3on4_decoder_select="mpegaudio"
 mp3on4float_decoder_select="mpegaudio"
 mpc7_decoder_select="bswapdsp mpegaudiodsp"
 mpc8_decoder_select="mpegaudiodsp"
-mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
-mpeg_xvmc_decoder_select="mpeg2video_decoder"
 mpeg1video_decoder_select="error_resilience mpeg_er mpegvideo"
 mpeg1video_encoder_select="aandcttables mpegvideoenc"
 mpeg2video_decoder_select="error_resilience mpeg_er mpegvideo"
@@ -4552,7 +4550,6 @@ check_header vdpau/vdpau.h
 check_header vdpau/vdpau_x11.h
 check_header VideoDecodeAcceleration/VDADecoder.h
 check_header windows.h
-check_header X11/extensions/XvMClib.h
 
 # it seems there are versions of clang in some distros that try to use the
 # gcc headers, which explodes for stdatomic
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index ee9d020..c38da8f 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -960,7 +960,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 }
 
 f->version = AV_RL32(avctx->extradata) >> 16;
-ff_blockdsp_init(>bdsp, avctx);
+ff_blockdsp_init(>bdsp);
 ff_bswapdsp_init(>bbdsp);
 f->avctx = avctx;
 init_vlcs(f);
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0beeda4..8e77222 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -12,7 +12,6 @@ HEADERS = avcodec.h   
  \
   vdpau.h   \
   version.h \
   vorbis_parser.h   \
-  xvmc.h\
 
 OBJS = allcodecs.o  \
avpacket.o   \
@@ -328,7 +327,6 @@ OBJS-$(CONFIG_MP3ON4_DECODER)  += 
mpegaudiodec_fixed.o mpeg4audio.o
 OBJS-$(CONFIG_MP3ON4FLOAT_DECODER) += mpegaudiodec_float.o mpeg4audio.o
 OBJS-$(CONFIG_MPC7_DECODER)+= mpc7.o mpc.o
 OBJS-$(CONFIG_MPC8_DECODER)+= mpc8.o mpc.o
-OBJS-$(CONFIG_MPEG_XVMC_DECODER)   += mpegvideo_xvmc.o
 OBJS-$(CONFIG_MPEG1VIDEO_DECODER)  += mpeg12dec.o mpeg12.o mpeg12data.o
 OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)  += mpeg12enc.o mpeg12.o
 OBJS-$(CONFIG_MPEG2_QSV_DECODER)   += qsvdec_other.o
@@ -777,7 +775,6 @@ SKIPHEADERS-$(CONFIG_D3D11VA)  += d3d11va.h 
dxva2_internal.h
 SKIPHEADERS-$(CONFIG_DXVA2)+= dxva2.h dxva2_internal.h
 SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
 SKIPHEADERS-$(CONFIG_LIBVPX)   += libvpx.h
-SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
 SKIPHEADERS-$(CONFIG_NVENC)+= nvenc.h
 SKIPHEADERS-$(CONFIG_QSV)  += qsv.h qsv_internal.h
 SKIPHEADERS-$(CONFIG_QSVDEC)   += qsvdec.h
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 591fd87..ba7874e 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -201,9 +201,6 @@ void avcodec_register_all(void)
 REGISTER_DECODER(MJPEGB,

[libav-devel] [PATCH] Remove deprecated XvMC support hacks

2016-12-06 Thread Diego Biurrun 
Deprecated in 11/2013.
---

What is mine is mine! I know where you live Vittorio!
And where your family lives also!1! ;-p

 configure |   3 -
 libavcodec/Makefile   |   3 -
 libavcodec/allcodecs.c|   3 -
 libavcodec/avcodec.h  |  17 ---
 libavcodec/blockdsp.c |  10 +-
 libavcodec/blockdsp.h |  10 +-
 libavcodec/codec_desc.c   |  11 +-
 libavcodec/error_resilience.c |  21 ---
 libavcodec/mpeg12dec.c| 103 -
 libavcodec/mpegvideo.c|  27 
 libavcodec/mpegvideo_xvmc.c   | 337 --
 libavcodec/options_table.h|   3 -
 libavcodec/version.h  |   3 -
 libavcodec/x86/blockdsp.c |  15 +-
 libavcodec/xvmc.h | 174 --
 libavcodec/xvmc_internal.h|  38 -
 libavutil/pixdesc.c   |  10 --
 libavutil/pixfmt.h|   4 -
 libavutil/version.h   |   3 -
 19 files changed, 6 insertions(+), 789 deletions(-)
 delete mode 100644 libavcodec/mpegvideo_xvmc.c
 delete mode 100644 libavcodec/xvmc.h
 delete mode 100644 libavcodec/xvmc_internal.h

diff --git a/configure b/configure
index 4c11e5e..cdc5cf0 100755
--- a/configure
+++ b/configure
@@ -2032,8 +2032,6 @@ mp3on4_decoder_select="mpegaudio"
 mp3on4float_decoder_select="mpegaudio"
 mpc7_decoder_select="bswapdsp mpegaudiodsp"
 mpc8_decoder_select="mpegaudiodsp"
-mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
-mpeg_xvmc_decoder_select="mpeg2video_decoder"
 mpeg1video_decoder_select="error_resilience mpeg_er mpegvideo"
 mpeg1video_encoder_select="aandcttables mpegvideoenc"
 mpeg2video_decoder_select="error_resilience mpeg_er mpegvideo"
@@ -4552,7 +4550,6 @@ check_header vdpau/vdpau.h
 check_header vdpau/vdpau_x11.h
 check_header VideoDecodeAcceleration/VDADecoder.h
 check_header windows.h
-check_header X11/extensions/XvMClib.h
 
 # it seems there are versions of clang in some distros that try to use the
 # gcc headers, which explodes for stdatomic
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0beeda4..8e77222 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -12,7 +12,6 @@ HEADERS = avcodec.h   
  \
   vdpau.h   \
   version.h \
   vorbis_parser.h   \
-  xvmc.h\
 
 OBJS = allcodecs.o  \
avpacket.o   \
@@ -328,7 +327,6 @@ OBJS-$(CONFIG_MP3ON4_DECODER)  += 
mpegaudiodec_fixed.o mpeg4audio.o
 OBJS-$(CONFIG_MP3ON4FLOAT_DECODER) += mpegaudiodec_float.o mpeg4audio.o
 OBJS-$(CONFIG_MPC7_DECODER)+= mpc7.o mpc.o
 OBJS-$(CONFIG_MPC8_DECODER)+= mpc8.o mpc.o
-OBJS-$(CONFIG_MPEG_XVMC_DECODER)   += mpegvideo_xvmc.o
 OBJS-$(CONFIG_MPEG1VIDEO_DECODER)  += mpeg12dec.o mpeg12.o mpeg12data.o
 OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)  += mpeg12enc.o mpeg12.o
 OBJS-$(CONFIG_MPEG2_QSV_DECODER)   += qsvdec_other.o
@@ -777,7 +775,6 @@ SKIPHEADERS-$(CONFIG_D3D11VA)  += d3d11va.h 
dxva2_internal.h
 SKIPHEADERS-$(CONFIG_DXVA2)+= dxva2.h dxva2_internal.h
 SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
 SKIPHEADERS-$(CONFIG_LIBVPX)   += libvpx.h
-SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
 SKIPHEADERS-$(CONFIG_NVENC)+= nvenc.h
 SKIPHEADERS-$(CONFIG_QSV)  += qsv.h qsv_internal.h
 SKIPHEADERS-$(CONFIG_QSVDEC)   += qsvdec.h
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 591fd87..ba7874e 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -201,9 +201,6 @@ void avcodec_register_all(void)
 REGISTER_DECODER(MJPEGB,mjpegb);
 REGISTER_DECODER(MMVIDEO,   mmvideo);
 REGISTER_DECODER(MOTIONPIXELS,  motionpixels);
-#if FF_API_XVMC
-REGISTER_DECODER(MPEG_XVMC, mpeg_xvmc);
-#endif /* FF_API_XVMC */
 REGISTER_ENCDEC (MPEG1VIDEO,mpeg1video);
 REGISTER_ENCDEC (MPEG2VIDEO,mpeg2video);
 REGISTER_DECODER(MPEG2_MMAL,mpeg2_mmal);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 635fdd2..1bcaf81 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -196,9 +196,6 @@ enum AVCodecID {
 /* video codecs */
 AV_CODEC_ID_MPEG1VIDEO,
 AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
-AV_CODEC_ID_MPEG2VIDEO_XVMC,
-#endif /* FF_API_XVMC */
 AV_CODEC_ID_H261,
 AV_CODEC_ID_H263,
 AV_CODEC_ID_RV10,
@@ -986,10 +983,6 @@ typedef struct RcOverride{
  */
 #define CODEC_CAP_DR1 0x0002
 #define CODEC_CAP_TRUNCATED   0x0008
-#if FF_API_XVMC
-/* Codec can export data for HW decoding