Merge commit 'd35d0c723e3c8fc8cde76bf677f67928f5e179a8'

* commit 'd35d0c723e3c8fc8cde76bf677f67928f5e179a8':
  vdpau: remove dysfunctional H.263 support

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc configure
index 16c1f59,7e80f9a..4518646
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2430,11 -2060,6 +2430,9 @@@ xvmc_deps="X11_extensions_XvMClib_h
  
  h263_vaapi_hwaccel_deps="vaapi"
  h263_vaapi_hwaccel_select="h263_decoder"
- h263_vdpau_hwaccel_deps="vdpau"
- h263_vdpau_hwaccel_select="h263_decoder"
 +h263_videotoolbox_hwaccel_deps="videotoolbox"
 +h263_videotoolbox_hwaccel_select="h263_decoder"
 +h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser"
  h264_d3d11va_hwaccel_deps="d3d11va"
  h264_d3d11va_hwaccel_select="h264_decoder"
  h264_dxva2_hwaccel_deps="dxva2"

diff --cc libavcodec/Makefile
index 8162447,0cca9ce..b61424f
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -714,8 -592,6 +714,7 @@@ OBJS-$(CONFIG_VIDEOTOOLBOX
  OBJS-$(CONFIG_VDPAU)                      += vdpau.o
  
  OBJS-$(CONFIG_H263_VAAPI_HWACCEL)         += vaapi_mpeg4.o
- OBJS-$(CONFIG_H263_VDPAU_HWACCEL)         += vdpau_mpeg4.o
 +OBJS-$(CONFIG_H263_VIDEOTOOLBOX_HWACCEL)  += videotoolbox.o
  OBJS-$(CONFIG_H264_D3D11VA_HWACCEL)       += dxva2_h264.o
  OBJS-$(CONFIG_H264_DXVA2_HWACCEL)         += dxva2_h264.o
  OBJS-$(CONFIG_H264_VAAPI_HWACCEL)         += vaapi_h264.o

diff --cc libavcodec/allcodecs.c
index 49478a1,0ad102c..29225bf
--- 1/libavcodec/allcodecs.c
--- 2/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@@ -75,8 -75,6 +75,7 @@@ void avcodec_register_all(void
  
      /* hardware accelerators */
      REGISTER_HWACCEL(H263_VAAPI,        h263_vaapi);
-     REGISTER_HWACCEL(H263_VDPAU,        h263_vdpau);
 +    REGISTER_HWACCEL(H263_VIDEOTOOLBOX, h263_videotoolbox);
      REGISTER_HWACCEL(H264_D3D11VA,      h264_d3d11va);
      REGISTER_HWACCEL(H264_DXVA2,        h264_dxva2);
      REGISTER_HWACCEL(H264_MMAL,         h264_mmal);

diff --cc libavcodec/h263dec.c
index 1958119,9e8cea5..ca7e5eb
--- 1/libavcodec/h263dec.c
--- 2/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@@ -720,14 -655,11 +720,14 @@@ frame_end
  
  const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = {
  #if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL
 -    AV_PIX_FMT_VAAPI_VLD,
 +    AV_PIX_FMT_VAAPI,
  #endif
- #if CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL
+ #if CONFIG_MPEG4_VDPAU_HWACCEL
      AV_PIX_FMT_VDPAU,
  #endif
 +#if CONFIG_H263_VIDEOTOOLBOX_HWACCEL || CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL
 +    AV_PIX_FMT_VIDEOTOOLBOX,
 +#endif
      AV_PIX_FMT_YUV420P,
      AV_PIX_FMT_NONE
  };

diff --cc libavcodec/vdpau_mpeg4.c
Simple merge