[FFmpeg-cvslog] Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'

James Almer git at videolan.org
Tue Oct 24 00:16:50 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 23 18:15:49 2017 -0300| [b773a8d8c1dfe4cfc6eabf509e26ab011270b9ed] | committer: James Almer

Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'

* commit 'dd343fd986459f467a2d1d70c26101dff1d47d68':
  lavu: Drop deprecated VDPAU pixel formats

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b773a8d8c1dfe4cfc6eabf509e26ab011270b9ed
---

 configure                  |  11 --
 libavcodec/allcodecs.c     |  16 ---
 libavcodec/h263dec.c       |   1 -
 libavcodec/h264_picture.c  |   1 -
 libavcodec/h264dec.c       |  28 +---
 libavcodec/mpeg12dec.c     |  64 +--------
 libavcodec/mpeg4videodec.c |  26 ----
 libavcodec/vc1dec.c        |  33 -----
 libavcodec/vdpau.c         | 345 ---------------------------------------------
 libavcodec/vdpau_compat.h  |  48 -------
 libavutil/pixdesc.c        |  38 -----
 libavutil/pixfmt.h         |  10 --
 libavutil/version.h        |   3 -
 13 files changed, 2 insertions(+), 622 deletions(-)

diff --git a/configure b/configure
index 2443986d21..98c92b2bdb 100755
--- a/configure
+++ b/configure
@@ -2810,8 +2810,6 @@ h264_rkmpp_decoder_deps="rkmpp"
 h264_rkmpp_decoder_select="h264_mp4toannexb_bsf"
 h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
 h264_vaapi_encoder_select="cbs_h264 vaapi_encode"
-h264_vdpau_decoder_deps="vdpau"
-h264_vdpau_decoder_select="h264_decoder"
 h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m"
 h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m"
 hevc_cuvid_decoder_deps="cuda cuvid"
@@ -2833,8 +2831,6 @@ mjpeg_cuvid_decoder_deps="cuda cuvid"
 mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
 mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
 mpeg1_cuvid_decoder_deps="cuda cuvid"
-mpeg1_vdpau_decoder_deps="vdpau"
-mpeg1_vdpau_decoder_select="mpeg1video_decoder"
 mpeg1_v4l2m2m_decoder_deps="v4l2_m2m mpeg1_v4l2_m2m"
 mpeg2_crystalhd_decoder_select="crystalhd"
 mpeg2_cuvid_decoder_deps="cuda cuvid"
@@ -2852,20 +2848,14 @@ mpeg4_cuvid_decoder_deps="cuda cuvid"
 mpeg4_mediacodec_decoder_deps="mediacodec"
 mpeg4_mmal_decoder_deps="mmal"
 mpeg4_omx_encoder_deps="omx"
-mpeg4_vdpau_decoder_deps="vdpau"
-mpeg4_vdpau_decoder_select="mpeg4_decoder"
 mpeg4_v4l2m2m_decoder_deps="v4l2_m2m mpeg4_v4l2_m2m"
 mpeg4_v4l2m2m_encoder_deps="v4l2_m2m mpeg4_v4l2_m2m"
-mpeg_vdpau_decoder_deps="vdpau"
-mpeg_vdpau_decoder_select="mpeg2video_decoder"
 msmpeg4_crystalhd_decoder_select="crystalhd"
 nvenc_h264_encoder_select="h264_nvenc_encoder"
 nvenc_hevc_encoder_select="hevc_nvenc_encoder"
 vc1_crystalhd_decoder_select="crystalhd"
 vc1_cuvid_decoder_deps="cuda cuvid"
 vc1_mmal_decoder_deps="mmal"
-vc1_vdpau_decoder_deps="vdpau"
-vc1_vdpau_decoder_select="vc1_decoder"
 vc1_v4l2m2m_decoder_deps="v4l2_m2m vc1_v4l2_m2m"
 vp8_cuvid_decoder_deps="cuda cuvid"
 vp8_mediacodec_decoder_deps="mediacodec"
@@ -2883,7 +2873,6 @@ vp9_vaapi_encoder_deps="VAEncPictureParameterBufferVP9"
 vp9_vaapi_encoder_select="vaapi_encode"
 vp9_v4l2m2m_decoder_deps="v4l2_m2m vp9_v4l2_m2m"
 wmv3_crystalhd_decoder_select="crystalhd"
-wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
 
 # parsers
 h264_parser_select="golomb h264dsp h264parse"
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index dea1b1d13b..83691267aa 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -215,9 +215,6 @@ static void register_all(void)
     REGISTER_DECODER(H264_MMAL,         h264_mmal);
     REGISTER_DECODER(H264_QSV,          h264_qsv);
     REGISTER_DECODER(H264_RKMPP,        h264_rkmpp);
-#if FF_API_VDPAU
-    REGISTER_DECODER(H264_VDPAU,        h264_vdpau);
-#endif
     REGISTER_ENCDEC (HAP,               hap);
     REGISTER_DECODER(HEVC,              hevc);
     REGISTER_DECODER(HEVC_QSV,          hevc_qsv);
@@ -256,14 +253,7 @@ static void register_all(void)
     REGISTER_DECODER(MPEG4_CRYSTALHD,   mpeg4_crystalhd);
     REGISTER_DECODER(MPEG4_V4L2M2M,     mpeg4_v4l2m2m);
     REGISTER_DECODER(MPEG4_MMAL,        mpeg4_mmal);
-#if FF_API_VDPAU
-    REGISTER_DECODER(MPEG4_VDPAU,       mpeg4_vdpau);
-#endif
     REGISTER_DECODER(MPEGVIDEO,         mpegvideo);
-#if FF_API_VDPAU
-    REGISTER_DECODER(MPEG_VDPAU,        mpeg_vdpau);
-    REGISTER_DECODER(MPEG1_VDPAU,       mpeg1_vdpau);
-#endif
     REGISTER_DECODER(MPEG1_V4L2M2M,     mpeg1_v4l2m2m);
     REGISTER_DECODER(MPEG2_MMAL,        mpeg2_mmal);
     REGISTER_DECODER(MPEG2_CRYSTALHD,   mpeg2_crystalhd);
@@ -359,9 +349,6 @@ static void register_all(void)
     REGISTER_DECODER(VBLE,              vble);
     REGISTER_DECODER(VC1,               vc1);
     REGISTER_DECODER(VC1_CRYSTALHD,     vc1_crystalhd);
-#if FF_API_VDPAU
-    REGISTER_DECODER(VC1_VDPAU,         vc1_vdpau);
-#endif
     REGISTER_DECODER(VC1IMAGE,          vc1image);
     REGISTER_DECODER(VC1_MMAL,          vc1_mmal);
     REGISTER_DECODER(VC1_QSV,           vc1_qsv);
@@ -390,9 +377,6 @@ static void register_all(void)
     REGISTER_ENCDEC (WMV2,              wmv2);
     REGISTER_DECODER(WMV3,              wmv3);
     REGISTER_DECODER(WMV3_CRYSTALHD,    wmv3_crystalhd);
-#if FF_API_VDPAU
-    REGISTER_DECODER(WMV3_VDPAU,        wmv3_vdpau);
-#endif
     REGISTER_DECODER(WMV3IMAGE,         wmv3image);
     REGISTER_DECODER(WNV1,              wnv1);
     REGISTER_DECODER(XAN_WC3,           xan_wc3);
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 288a0cd431..c7cf4bc0c2 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -41,7 +41,6 @@
 #include "mpegvideo.h"
 #include "msmpeg4.h"
 #include "qpeldsp.h"
-#include "vdpau_compat.h"
 #include "thread.h"
 #include "wmv2.h"
 
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index 30987d3145..e7dd84bc47 100644
--- a/libavcodec/h264_picture.c
+++ b/libavcodec/h264_picture.c
@@ -41,7 +41,6 @@
 #include "mpegutils.h"
 #include "rectangle.h"
 #include "thread.h"
-#include "vdpau_compat.h"
 
 void ff_h264_unref_picture(H264Context *h, H264Picture *pic)
 {
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index 5abaaabf9d..4216b66684 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -50,10 +50,10 @@
 #include "mathops.h"
 #include "me_cmp.h"
 #include "mpegutils.h"
+#include "mpeg4video.h"
 #include "profiles.h"
 #include "rectangle.h"
 #include "thread.h"
-#include "vdpau_compat.h"
 
 const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 };
 
@@ -1049,29 +1049,3 @@ AVCodec ff_h264_decoder = {
     .profiles              = NULL_IF_CONFIG_SMALL(ff_h264_profiles),
     .priv_class            = &h264_class,
 };
-
-#if CONFIG_H264_VDPAU_DECODER && FF_API_VDPAU
-static const AVClass h264_vdpau_class = {
-    .class_name = "H264 VDPAU Decoder",
-    .item_name  = av_default_item_name,
-    .option     = h264_options,
-    .version    = LIBAVUTIL_VERSION_INT,
-};
-
-AVCodec ff_h264_vdpau_decoder = {
-    .name           = "h264_vdpau",
-    .long_name      = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
-    .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = AV_CODEC_ID_H264,
-    .priv_data_size = sizeof(H264Context),
-    .init           = h264_decode_init,
-    .close          = h264_decode_end,
-    .decode         = h264_decode_frame,
-    .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU,
-    .flush          = flush_dpb,
-    .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_H264,
-                                                     AV_PIX_FMT_NONE},
-    .profiles       = NULL_IF_CONFIG_SMALL(ff_h264_profiles),
-    .priv_class     = &h264_vdpau_class,
-};
-#endif
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index f102246f52..82bb1286ff 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -47,7 +47,6 @@
 #include "profiles.h"
 #include "thread.h"
 #include "version.h"
-#include "vdpau_compat.h"
 #include "xvmc_internal.h"
 
 typedef struct Mpeg1Context {
@@ -1134,9 +1133,6 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
 #if CONFIG_MPEG1_XVMC_HWACCEL
     AV_PIX_FMT_XVMC,
 #endif
-#if CONFIG_MPEG1_VDPAU_DECODER && FF_API_VDPAU
-    AV_PIX_FMT_VDPAU_MPEG1,
-#endif
 #if CONFIG_MPEG1_VDPAU_HWACCEL
     AV_PIX_FMT_VDPAU,
 #endif
@@ -1148,9 +1144,6 @@ static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
 #if CONFIG_MPEG2_XVMC_HWACCEL
     AV_PIX_FMT_XVMC,
 #endif
-#if CONFIG_MPEG_VDPAU_DECODER && FF_API_VDPAU
-    AV_PIX_FMT_VDPAU_MPEG2,
-#endif
 #if CONFIG_MPEG2_VDPAU_HWACCEL
     AV_PIX_FMT_VDPAU,
 #endif
@@ -1181,12 +1174,6 @@ static const enum AVPixelFormat mpeg12_pixfmt_list_444[] = {
     AV_PIX_FMT_NONE
 };
 
-#if FF_API_VDPAU
-static inline int uses_vdpau(AVCodecContext *avctx) {
-    return avctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG1 || avctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG2;
-}
-#endif
-
 static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
 {
     Mpeg1Context *s1  = avctx->priv_data;
@@ -1211,11 +1198,7 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
 static void setup_hwaccel_for_pixfmt(AVCodecContext *avctx)
 {
     // until then pix_fmt may be changed right after codec init
-    if (avctx->hwaccel
-#if FF_API_VDPAU
-        || uses_vdpau(avctx)
-#endif
-        )
+    if (avctx->hwaccel)
         if (avctx->idct_algo == FF_IDCT_AUTO)
             avctx->idct_algo = FF_IDCT_NONE;
 
@@ -2450,12 +2433,6 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture,
                         s2->er.error_count += s2->thread_context[i]->er.error_count;
                 }
 
-#if FF_API_VDPAU
-                if ((CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER)
-                    && uses_vdpau(avctx))
-                    ff_vdpau_mpeg_picture_complete(s2, buf, buf_size, s->slice_count);
-#endif
-
                 ret = slice_end(avctx, picture);
                 if (ret < 0)
                     return ret;
@@ -2707,13 +2684,6 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture,
                     return AVERROR_INVALIDDATA;
                 }
 
-#if FF_API_VDPAU
-                if (uses_vdpau(avctx)) {
-                    s->slice_count++;
-                    break;
-                }
-#endif
-
                 if (HAVE_THREADS &&
                     (avctx->active_thread_type & FF_THREAD_SLICE) &&
                     !avctx->hwaccel) {
@@ -2904,35 +2874,3 @@ AVCodec ff_mpegvideo_decoder = {
     .flush          = flush,
     .max_lowres     = 3,
 };
-
-#if CONFIG_MPEG_VDPAU_DECODER && FF_API_VDPAU
-AVCodec ff_mpeg_vdpau_decoder = {
-    .name           = "mpegvideo_vdpau",
-    .long_name      = NULL_IF_CONFIG_SMALL("MPEG-1/2 video (VDPAU acceleration)"),
-    .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = AV_CODEC_ID_MPEG2VIDEO,
-    .priv_data_size = sizeof(Mpeg1Context),
-    .init           = mpeg_decode_init,
-    .close          = mpeg_decode_end,
-    .decode         = mpeg_decode_frame,
-    .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED |
-                      AV_CODEC_CAP_HWACCEL_VDPAU | AV_CODEC_CAP_DELAY,
-    .flush          = flush,
-};
-#endif
-
-#if CONFIG_MPEG1_VDPAU_DECODER && FF_API_VDPAU
-AVCodec ff_mpeg1_vdpau_decoder = {
-    .name           = "mpeg1video_vdpau",
-    .long_name      = NULL_IF_CONFIG_SMALL("MPEG-1 video (VDPAU acceleration)"),
-    .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = AV_CODEC_ID_MPEG1VIDEO,
-    .priv_data_size = sizeof(Mpeg1Context),
-    .init           = mpeg_decode_init,
-    .close          = mpeg_decode_end,
-    .decode         = mpeg_decode_frame,
-    .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED |
-                      AV_CODEC_CAP_HWACCEL_VDPAU | AV_CODEC_CAP_DELAY,
-    .flush          = flush,
-};
-#endif
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index cd39131d55..82c4f8fc8c 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2845,29 +2845,3 @@ AVCodec ff_mpeg4_decoder = {
     .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg4_update_thread_context),
     .priv_class = &mpeg4_class,
 };
-
-
-#if CONFIG_MPEG4_VDPAU_DECODER && FF_API_VDPAU
-static const AVClass mpeg4_vdpau_class = {
-    "MPEG4 Video VDPAU Decoder",
-    av_default_item_name,
-    mpeg4_options,
-    LIBAVUTIL_VERSION_INT,
-};
-
-AVCodec ff_mpeg4_vdpau_decoder = {
-    .name           = "mpeg4_vdpau",
-    .long_name      = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"),
-    .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = AV_CODEC_ID_MPEG4,
-    .priv_data_size = sizeof(Mpeg4DecContext),
-    .init           = decode_init,
-    .close          = ff_h263_decode_end,
-    .decode         = ff_h263_decode_frame,
-    .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY |
-                      AV_CODEC_CAP_HWACCEL_VDPAU,
-    .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_MPEG4,
-                                                  AV_PIX_FMT_NONE },
-    .priv_class     = &mpeg4_vdpau_class,
-};
-#endif
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index b68115613a..6bdaeca98e 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -37,7 +37,6 @@
 #include "profiles.h"
 #include "vc1.h"
 #include "vc1data.h"
-#include "vdpau_compat.h"
 #include "libavutil/avassert.h"
 
 
@@ -1162,38 +1161,6 @@ AVCodec ff_wmv3_decoder = {
 };
 #endif
 
-#if CONFIG_WMV3_VDPAU_DECODER && FF_API_VDPAU
-AVCodec ff_wmv3_vdpau_decoder = {
-    .name           = "wmv3_vdpau",
-    .long_name      = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"),
-    .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = AV_CODEC_ID_WMV3,
-    .priv_data_size = sizeof(VC1Context),
-    .init           = vc1_decode_init,
-    .close          = ff_vc1_decode_end,
-    .decode         = vc1_decode_frame,
-    .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU,
-    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_WMV3, AV_PIX_FMT_NONE },
-    .profiles       = NULL_IF_CONFIG_SMALL(ff_vc1_profiles)
-};
-#endif
-
-#if CONFIG_VC1_VDPAU_DECODER && FF_API_VDPAU
-AVCodec ff_vc1_vdpau_decoder = {
-    .name           = "vc1_vdpau",
-    .long_name      = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"),
-    .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = AV_CODEC_ID_VC1,
-    .priv_data_size = sizeof(VC1Context),
-    .init           = vc1_decode_init,
-    .close          = ff_vc1_decode_end,
-    .decode         = vc1_decode_frame,
-    .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU,
-    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_VC1, AV_PIX_FMT_NONE },
-    .profiles       = NULL_IF_CONFIG_SMALL(ff_vc1_profiles)
-};
-#endif
-
 #if CONFIG_WMV3IMAGE_DECODER
 AVCodec ff_wmv3image_decoder = {
     .name           = "wmv3image",
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 7053dd162a..ee3610428f 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -28,17 +28,11 @@
 #include "h264dec.h"
 #include "vc1.h"
 #include "vdpau.h"
-#include "vdpau_compat.h"
 #include "vdpau_internal.h"
 
 // XXX: at the time of adding this ifdefery, av_assert* wasn't use outside.
 // When dropping it, make sure other av_assert* were not added since then.
 
-#if FF_API_VDPAU
-#undef NDEBUG
-#include <assert.h>
-#endif
-
 /**
  * @addtogroup VDPAU_Decoding
  *
@@ -401,345 +395,6 @@ int ff_vdpau_add_buffer(struct vdpau_picture_context *pic_ctx,
     return 0;
 }
 
-/* Obsolete non-hwaccel VDPAU support below... */
-
-#if FF_API_VDPAU
-void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf, int buf_size)
-{
-    struct vdpau_render_state *render = (struct vdpau_render_state*)data;
-    assert(render);
-
-    render->bitstream_buffers= av_fast_realloc(
-        render->bitstream_buffers,
-        &render->bitstream_buffers_allocated,
-        sizeof(*render->bitstream_buffers)*(render->bitstream_buffers_used + 1)
-    );
-
-    render->bitstream_buffers[render->bitstream_buffers_used].struct_version  = VDP_BITSTREAM_BUFFER_VERSION;
-    render->bitstream_buffers[render->bitstream_buffers_used].bitstream       = buf;
-    render->bitstream_buffers[render->bitstream_buffers_used].bitstream_bytes = buf_size;
-    render->bitstream_buffers_used++;
-}
-
-#if CONFIG_H264_VDPAU_DECODER
-void ff_vdpau_h264_set_reference_frames(H264Context *h)
-{
-    struct vdpau_render_state *render, *render_ref;
-    VdpReferenceFrameH264 *rf, *rf2;
-    H264Picture *pic;
-    int i, list, pic_frame_idx;
-
-    render = (struct vdpau_render_state *)h->cur_pic_ptr->f->data[0];
-    assert(render);
-
-    rf = &render->info.h264.referenceFrames[0];
-#define H264_RF_COUNT FF_ARRAY_ELEMS(render->info.h264.referenceFrames)
-
-    for (list = 0; list < 2; ++list) {
-        H264Picture **lp = list ? h->long_ref : h->short_ref;
-        int ls = list ? 16 : h->short_ref_count;
-
-        for (i = 0; i < ls; ++i) {
-            pic = lp[i];
-            if (!pic || !pic->reference)
-                continue;
-            pic_frame_idx = pic->long_ref ? pic->pic_id : pic->frame_num;
-
-            render_ref = (struct vdpau_render_state *)pic->f->data[0];
-            assert(render_ref);
-
-            rf2 = &render->info.h264.referenceFrames[0];
-            while (rf2 != rf) {
-                if (
-                    (rf2->surface == render_ref->surface)
-                    && (rf2->is_long_term == pic->long_ref)
-                    && (rf2->frame_idx == pic_frame_idx)
-                )
-                    break;
-                ++rf2;
-            }
-            if (rf2 != rf) {
-                rf2->top_is_reference    |= (pic->reference & PICT_TOP_FIELD)    ? VDP_TRUE : VDP_FALSE;
-                rf2->bottom_is_reference |= (pic->reference & PICT_BOTTOM_FIELD) ? VDP_TRUE : VDP_FALSE;
-                continue;
-            }
-
-            if (rf >= &render->info.h264.referenceFrames[H264_RF_COUNT])
-                continue;
-
-            rf->surface             = render_ref->surface;
-            rf->is_long_term        = pic->long_ref;
-            rf->top_is_reference    = (pic->reference & PICT_TOP_FIELD)    ? VDP_TRUE : VDP_FALSE;
-            rf->bottom_is_reference = (pic->reference & PICT_BOTTOM_FIELD) ? VDP_TRUE : VDP_FALSE;
-            rf->field_order_cnt[0]  = pic->field_poc[0];
-            rf->field_order_cnt[1]  = pic->field_poc[1];
-            rf->frame_idx           = pic_frame_idx;
-
-            ++rf;
-        }
-    }
-
-    for (; rf < &render->info.h264.referenceFrames[H264_RF_COUNT]; ++rf) {
-        rf->surface             = VDP_INVALID_HANDLE;
-        rf->is_long_term        = 0;
-        rf->top_is_reference    = 0;
-        rf->bottom_is_reference = 0;
-        rf->field_order_cnt[0]  = 0;
-        rf->field_order_cnt[1]  = 0;
-        rf->frame_idx           = 0;
-    }
-}
-
-void ff_vdpau_h264_picture_start(H264Context *h)
-{
-    struct vdpau_render_state *render;
-    int i;
-
-    render = (struct vdpau_render_state *)h->cur_pic_ptr->f->data[0];
-    assert(render);
-
-    for (i = 0; i < 2; ++i) {
-        int foc = h->cur_pic_ptr->field_poc[i];
-        if (foc == INT_MAX)
-            foc = 0;
-        render->info.h264.field_order_cnt[i] = foc;
-    }
-
-    render->info.h264.frame_num = h->poc.frame_num;
-}
-
-void ff_vdpau_h264_picture_complete(H264Context *h)
-{
-    struct vdpau_render_state *render;
-
-    render = (struct vdpau_render_state *)h->cur_pic_ptr->f->data[0];
-    assert(render);
-
-    render->info.h264.slice_count = h->current_slice;
-    if (render->info.h264.slice_count < 1)
-        return;
-
-    render->info.h264.is_reference                           = (h->cur_pic_ptr->reference & 3) ? VDP_TRUE : VDP_FALSE;
-    render->info.h264.field_pic_flag                         = h->picture_structure != PICT_FRAME;
-    render->info.h264.bottom_field_flag                      = h->picture_structure == PICT_BOTTOM_FIELD;
-    render->info.h264.num_ref_frames                         = h->ps.sps->ref_frame_count;
-    render->info.h264.mb_adaptive_frame_field_flag           = h->ps.sps->mb_aff && !render->info.h264.field_pic_flag;
-    render->info.h264.constrained_intra_pred_flag            = h->ps.pps->constrained_intra_pred;
-    render->info.h264.weighted_pred_flag                     = h->ps.pps->weighted_pred;
-    render->info.h264.weighted_bipred_idc                    = h->ps.pps->weighted_bipred_idc;
-    render->info.h264.frame_mbs_only_flag                    = h->ps.sps->frame_mbs_only_flag;
-    render->info.h264.transform_8x8_mode_flag                = h->ps.pps->transform_8x8_mode;
-    render->info.h264.chroma_qp_index_offset                 = h->ps.pps->chroma_qp_index_offset[0];
-    render->info.h264.second_chroma_qp_index_offset          = h->ps.pps->chroma_qp_index_offset[1];
-    render->info.h264.pic_init_qp_minus26                    = h->ps.pps->init_qp - 26;
-    render->info.h264.num_ref_idx_l0_active_minus1           = h->ps.pps->ref_count[0] - 1;
-    render->info.h264.num_ref_idx_l1_active_minus1           = h->ps.pps->ref_count[1] - 1;
-    render->info.h264.log2_max_frame_num_minus4              = h->ps.sps->log2_max_frame_num - 4;
-    render->info.h264.pic_order_cnt_type                     = h->ps.sps->poc_type;
-    render->info.h264.log2_max_pic_order_cnt_lsb_minus4      = h->ps.sps->poc_type ? 0 : h->ps.sps->log2_max_poc_lsb - 4;
-    render->info.h264.delta_pic_order_always_zero_flag       = h->ps.sps->delta_pic_order_always_zero_flag;
-    render->info.h264.direct_8x8_inference_flag              = h->ps.sps->direct_8x8_inference_flag;
-    render->info.h264.entropy_coding_mode_flag               = h->ps.pps->cabac;
-    render->info.h264.pic_order_present_flag                 = h->ps.pps->pic_order_present;
-    render->info.h264.deblocking_filter_control_present_flag = h->ps.pps->deblocking_filter_parameters_present;
-    render->info.h264.redundant_pic_cnt_present_flag         = h->ps.pps->redundant_pic_cnt_present;
-    memcpy(render->info.h264.scaling_lists_4x4, h->ps.pps->scaling_matrix4, sizeof(render->info.h264.scaling_lists_4x4));
-    memcpy(render->info.h264.scaling_lists_8x8[0], h->ps.pps->scaling_matrix8[0], sizeof(render->info.h264.scaling_lists_8x8[0]));
-    memcpy(render->info.h264.scaling_lists_8x8[1], h->ps.pps->scaling_matrix8[3], sizeof(render->info.h264.scaling_lists_8x8[0]));
-
-    ff_h264_draw_horiz_band(h, &h->slice_ctx[0], 0, h->avctx->height);
-    render->bitstream_buffers_used = 0;
-}
-#endif /* CONFIG_H264_VDPAU_DECODER */
-
-#if CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER
-void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
-                                    int buf_size, int slice_count)
-{
-    struct vdpau_render_state *render, *last, *next;
-    int i;
-
-    if (!s->current_picture_ptr) return;
-
-    render = (struct vdpau_render_state *)s->current_picture_ptr->f->data[0];
-    assert(render);
-
-    /* fill VdpPictureInfoMPEG1Or2 struct */
-    render->info.mpeg.picture_structure          = s->picture_structure;
-    render->info.mpeg.picture_coding_type        = s->pict_type;
-    render->info.mpeg.intra_dc_precision         = s->intra_dc_precision;
-    render->info.mpeg.frame_pred_frame_dct       = s->frame_pred_frame_dct;
-    render->info.mpeg.concealment_motion_vectors = s->concealment_motion_vectors;
-    render->info.mpeg.intra_vlc_format           = s->intra_vlc_format;
-    render->info.mpeg.alternate_scan             = s->alternate_scan;
-    render->info.mpeg.q_scale_type               = s->q_scale_type;
-    render->info.mpeg.top_field_first            = s->top_field_first;
-    render->info.mpeg.full_pel_forward_vector    = s->full_pel[0]; // MPEG-1 only.  Set 0 for MPEG-2
-    render->info.mpeg.full_pel_backward_vector   = s->full_pel[1]; // MPEG-1 only.  Set 0 for MPEG-2
-    render->info.mpeg.f_code[0][0]               = s->mpeg_f_code[0][0]; // For MPEG-1 fill both horiz. & vert.
-    render->info.mpeg.f_code[0][1]               = s->mpeg_f_code[0][1];
-    render->info.mpeg.f_code[1][0]               = s->mpeg_f_code[1][0];
-    render->info.mpeg.f_code[1][1]               = s->mpeg_f_code[1][1];
-    for (i = 0; i < 64; ++i) {
-        render->info.mpeg.intra_quantizer_matrix[i]     = s->intra_matrix[i];
-        render->info.mpeg.non_intra_quantizer_matrix[i] = s->inter_matrix[i];
-    }
-
-    render->info.mpeg.forward_reference          = VDP_INVALID_HANDLE;
-    render->info.mpeg.backward_reference         = VDP_INVALID_HANDLE;
-
-    switch(s->pict_type){
-    case  AV_PICTURE_TYPE_B:
-        next = (struct vdpau_render_state *)s->next_picture.f->data[0];
-        assert(next);
-        render->info.mpeg.backward_reference     = next->surface;
-        // no return here, going to set forward prediction
-    case  AV_PICTURE_TYPE_P:
-        last = (struct vdpau_render_state *)s->last_picture.f->data[0];
-        if (!last) // FIXME: Does this test make sense?
-            last = render; // predict second field from the first
-        render->info.mpeg.forward_reference      = last->surface;
-    }
-
-    ff_vdpau_add_data_chunk(s->current_picture_ptr->f->data[0], buf, buf_size);
-
-    render->info.mpeg.slice_count                = slice_count;
-
-    if (slice_count)
-        ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
-    render->bitstream_buffers_used               = 0;
-}
-#endif /* CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER */
-
-#if CONFIG_VC1_VDPAU_DECODER
-void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
-                                 int buf_size)
-{
-    VC1Context *v = s->avctx->priv_data;
-    struct vdpau_render_state *render, *last, *next;
-
-    render = (struct vdpau_render_state *)s->current_picture.f->data[0];
-    assert(render);
-
-    /*  fill LvPictureInfoVC1 struct */
-    render->info.vc1.frame_coding_mode  = v->fcm ? v->fcm + 1 : 0;
-    render->info.vc1.postprocflag       = v->postprocflag;
-    render->info.vc1.pulldown           = v->broadcast;
-    render->info.vc1.interlace          = v->interlace;
-    render->info.vc1.tfcntrflag         = v->tfcntrflag;
-    render->info.vc1.finterpflag        = v->finterpflag;
-    render->info.vc1.psf                = v->psf;
-    render->info.vc1.dquant             = v->dquant;
-    render->info.vc1.panscan_flag       = v->panscanflag;
-    render->info.vc1.refdist_flag       = v->refdist_flag;
-    render->info.vc1.quantizer          = v->quantizer_mode;
-    render->info.vc1.extended_mv        = v->extended_mv;
-    render->info.vc1.extended_dmv       = v->extended_dmv;
-    render->info.vc1.overlap            = v->overlap;
-    render->info.vc1.vstransform        = v->vstransform;
-    render->info.vc1.loopfilter         = v->s.loop_filter;
-    render->info.vc1.fastuvmc           = v->fastuvmc;
-    render->info.vc1.range_mapy_flag    = v->range_mapy_flag;
-    render->info.vc1.range_mapy         = v->range_mapy;
-    render->info.vc1.range_mapuv_flag   = v->range_mapuv_flag;
-    render->info.vc1.range_mapuv        = v->range_mapuv;
-    /* Specific to simple/main profile only */
-    render->info.vc1.multires           = v->multires;
-    render->info.vc1.syncmarker         = v->resync_marker;
-    render->info.vc1.rangered           = v->rangered | (v->rangeredfrm << 1);
-    render->info.vc1.maxbframes         = v->s.max_b_frames;
-
-    render->info.vc1.deblockEnable      = v->postprocflag & 1;
-    render->info.vc1.pquant             = v->pq;
-
-    render->info.vc1.forward_reference  = VDP_INVALID_HANDLE;
-    render->info.vc1.backward_reference = VDP_INVALID_HANDLE;
-
-    if (v->bi_type)
-        render->info.vc1.picture_type = 4;
-    else
-        render->info.vc1.picture_type = s->pict_type - 1 + s->pict_type / 3;
-
-    switch(s->pict_type){
-    case  AV_PICTURE_TYPE_B:
-        next = (struct vdpau_render_state *)s->next_picture.f->data[0];
-        assert(next);
-        render->info.vc1.backward_reference = next->surface;
-        // no break here, going to set forward prediction
-    case  AV_PICTURE_TYPE_P:
-        last = (struct vdpau_render_state *)s->last_picture.f->data[0];
-        if (!last) // FIXME: Does this test make sense?
-            last = render; // predict second field from the first
-        render->info.vc1.forward_reference = last->surface;
-    }
-
-    ff_vdpau_add_data_chunk(s->current_picture_ptr->f->data[0], buf, buf_size);
-
-    render->info.vc1.slice_count          = 1;
-
-    ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
-    render->bitstream_buffers_used        = 0;
-}
-#endif /* (CONFIG_VC1_VDPAU_DECODER */
-
-#if CONFIG_MPEG4_VDPAU_DECODER
-void ff_vdpau_mpeg4_decode_picture(Mpeg4DecContext *ctx, const uint8_t *buf,
-                                   int buf_size)
-{
-    MpegEncContext *s = &ctx->m;
-    struct vdpau_render_state *render, *last, *next;
-    int i;
-
-    if (!s->current_picture_ptr) return;
-
-    render = (struct vdpau_render_state *)s->current_picture_ptr->f->data[0];
-    assert(render);
-
-    /* fill VdpPictureInfoMPEG4Part2 struct */
-    render->info.mpeg4.trd[0]                            = s->pp_time;
-    render->info.mpeg4.trb[0]                            = s->pb_time;
-    render->info.mpeg4.trd[1]                            = s->pp_field_time >> 1;
-    render->info.mpeg4.trb[1]                            = s->pb_field_time >> 1;
-    render->info.mpeg4.vop_time_increment_resolution     = s->avctx->time_base.den;
-    render->info.mpeg4.vop_coding_type                   = 0;
-    render->info.mpeg4.vop_fcode_forward                 = s->f_code;
-    render->info.mpeg4.vop_fcode_backward                = s->b_code;
-    render->info.mpeg4.resync_marker_disable             = !ctx->resync_marker;
-    render->info.mpeg4.interlaced                        = !s->progressive_sequence;
-    render->info.mpeg4.quant_type                        = s->mpeg_quant;
-    render->info.mpeg4.quarter_sample                    = s->quarter_sample;
-    render->info.mpeg4.short_video_header                = s->avctx->codec->id == AV_CODEC_ID_H263;
-    render->info.mpeg4.rounding_control                  = s->no_rounding;
-    render->info.mpeg4.alternate_vertical_scan_flag      = s->alternate_scan;
-    render->info.mpeg4.top_field_first                   = s->top_field_first;
-    for (i = 0; i < 64; ++i) {
-        render->info.mpeg4.intra_quantizer_matrix[i]     = s->intra_matrix[i];
-        render->info.mpeg4.non_intra_quantizer_matrix[i] = s->inter_matrix[i];
-    }
-    render->info.mpeg4.forward_reference                 = VDP_INVALID_HANDLE;
-    render->info.mpeg4.backward_reference                = VDP_INVALID_HANDLE;
-
-    switch (s->pict_type) {
-    case AV_PICTURE_TYPE_B:
-        next = (struct vdpau_render_state *)s->next_picture.f->data[0];
-        assert(next);
-        render->info.mpeg4.backward_reference     = next->surface;
-        render->info.mpeg4.vop_coding_type        = 2;
-        // no break here, going to set forward prediction
-    case AV_PICTURE_TYPE_P:
-        last = (struct vdpau_render_state *)s->last_picture.f->data[0];
-        assert(last);
-        render->info.mpeg4.forward_reference      = last->surface;
-    }
-
-    ff_vdpau_add_data_chunk(s->current_picture_ptr->f->data[0], buf, buf_size);
-
-    ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
-    render->bitstream_buffers_used = 0;
-}
-#endif /* CONFIG_MPEG4_VDPAU_DECODER */
-#endif /* FF_API_VDPAU */
-
 #if FF_API_VDPAU_PROFILE
 int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile)
 {
diff --git a/libavcodec/vdpau_compat.h b/libavcodec/vdpau_compat.h
deleted file mode 100644
index 768acce78c..0000000000
--- a/libavcodec/vdpau_compat.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Video Decode and Presentation API for UNIX (VDPAU) is used for
- * HW decode acceleration for MPEG-1/2, H.264 and VC-1.
- *
- * Copyright (C) 2008 NVIDIA
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDPAU_COMPAT_H
-#define AVCODEC_VDPAU_COMPAT_H
-
-#include <stdint.h>
-
-#include "h264dec.h"
-#include "mpeg4video.h"
-
-void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf,
-                             int buf_size);
-
-void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
-                                    int buf_size, int slice_count);
-
-void ff_vdpau_h264_picture_start(H264Context *h);
-void ff_vdpau_h264_set_reference_frames(H264Context *h);
-void ff_vdpau_h264_picture_complete(H264Context *h);
-
-void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
-                                 int buf_size);
-
-void ff_vdpau_mpeg4_decode_picture(Mpeg4DecContext *s, const uint8_t *buf,
-                                   int buf_size);
-
-#endif /* AVCODEC_VDPAU_COMPAT_H */
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 81b763b961..3d21e67a78 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -977,44 +977,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
         },
         .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
     },
-#if FF_API_VDPAU
-    [AV_PIX_FMT_VDPAU_H264] = {
-        .name = "vdpau_h264",
-        .log2_chroma_w = 1,
-        .log2_chroma_h = 1,
-        .flags = AV_PIX_FMT_FLAG_HWACCEL,
-    },
-    [AV_PIX_FMT_VDPAU_MPEG1] = {
-        .name = "vdpau_mpeg1",
-        .log2_chroma_w = 1,
-        .log2_chroma_h = 1,
-        .flags = AV_PIX_FMT_FLAG_HWACCEL,
-    },
-    [AV_PIX_FMT_VDPAU_MPEG2] = {
-        .name = "vdpau_mpeg2",
-        .log2_chroma_w = 1,
-        .log2_chroma_h = 1,
-        .flags = AV_PIX_FMT_FLAG_HWACCEL,
-    },
-    [AV_PIX_FMT_VDPAU_WMV3] = {
-        .name = "vdpau_wmv3",
-        .log2_chroma_w = 1,
-        .log2_chroma_h = 1,
-        .flags = AV_PIX_FMT_FLAG_HWACCEL,
-    },
-    [AV_PIX_FMT_VDPAU_VC1] = {
-        .name = "vdpau_vc1",
-        .log2_chroma_w = 1,
-        .log2_chroma_h = 1,
-        .flags = AV_PIX_FMT_FLAG_HWACCEL,
-    },
-    [AV_PIX_FMT_VDPAU_MPEG4] = {
-        .name = "vdpau_mpeg4",
-        .log2_chroma_w = 1,
-        .log2_chroma_h = 1,
-        .flags = AV_PIX_FMT_FLAG_HWACCEL,
-    },
-#endif
     [AV_PIX_FMT_RGB48BE] = {
         .name = "rgb48be",
         .nb_components = 3,
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 6b6b4ae0fb..a520028962 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -95,13 +95,6 @@ enum AVPixelFormat {
     AV_PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
     AV_PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV440P and setting color_range
     AV_PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-#if FF_API_VDPAU
-    AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
     AV_PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
     AV_PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
 
@@ -137,9 +130,6 @@ enum AVPixelFormat {
     AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
     AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
     AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-#if FF_API_VDPAU
-    AV_PIX_FMT_VDPAU_MPEG4,  ///< MPEG-4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
     AV_PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
 
     AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), little-endian, X=unused/undefined
diff --git a/libavutil/version.h b/libavutil/version.h
index f5b4f1548d..def7153f31 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -106,9 +106,6 @@
  * @{
  */
 
-#ifndef FF_API_VDPAU
-#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
 #ifndef FF_API_OPT_TYPE_METADATA
 #define FF_API_OPT_TYPE_METADATA        (LIBAVUTIL_VERSION_MAJOR < 56)
 #endif


======================================================================

diff --cc configure
index 2443986d21,366520cf96..98c92b2bdb
--- a/configure
+++ b/configure
@@@ -2806,84 -2248,35 +2806,73 @@@ h264_qsv_decoder_deps="libmfx
  h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"
  h264_qsv_encoder_deps="libmfx"
  h264_qsv_encoder_select="qsvenc"
 +h264_rkmpp_decoder_deps="rkmpp"
 +h264_rkmpp_decoder_select="h264_mp4toannexb_bsf"
  h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
 -h264_vaapi_encoder_select="vaapi_encode golomb"
 +h264_vaapi_encoder_select="cbs_h264 vaapi_encode"
- h264_vdpau_decoder_deps="vdpau"
- h264_vdpau_decoder_select="h264_decoder"
 +h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m"
 +h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m"
 +hevc_cuvid_decoder_deps="cuda cuvid"
 +hevc_cuvid_decoder_select="hevc_mp4toannexb_bsf"
 +hevc_mediacodec_decoder_deps="mediacodec"
 +hevc_mediacodec_decoder_select="hevc_mp4toannexb_bsf hevc_parser"
  hevc_nvenc_encoder_deps="nvenc"
  hevc_qsv_decoder_deps="libmfx"
 -hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser hevc_qsv_hwaccel qsvdec"
 +hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel"
  hevc_qsv_encoder_deps="libmfx"
 -hevc_qsv_encoder_select="hevc_ps qsvenc"
 +hevc_qsv_encoder_select="hevcparse qsvenc"
 +hevc_rkmpp_decoder_deps="rkmpp"
 +hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf"
  hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC"
 -hevc_vaapi_encoder_select="vaapi_encode golomb"
 +hevc_vaapi_encoder_select="cbs_h265 vaapi_encode"
 +hevc_v4l2m2m_decoder_deps="v4l2_m2m hevc_v4l2_m2m"
 +hevc_v4l2m2m_encoder_deps="v4l2_m2m hevc_v4l2_m2m"
 +mjpeg_cuvid_decoder_deps="cuda cuvid"
  mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
  mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
 +mpeg1_cuvid_decoder_deps="cuda cuvid"
- mpeg1_vdpau_decoder_deps="vdpau"
- mpeg1_vdpau_decoder_select="mpeg1video_decoder"
 +mpeg1_v4l2m2m_decoder_deps="v4l2_m2m mpeg1_v4l2_m2m"
 +mpeg2_crystalhd_decoder_select="crystalhd"
 +mpeg2_cuvid_decoder_deps="cuda cuvid"
  mpeg2_mmal_decoder_deps="mmal"
 +mpeg2_mediacodec_decoder_deps="mediacodec"
  mpeg2_qsv_decoder_deps="libmfx"
 -mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel mpegvideo_parser"
 +mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel"
  mpeg2_qsv_encoder_deps="libmfx"
  mpeg2_qsv_encoder_select="qsvenc"
  mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"
 -mpeg2_vaapi_encoder_select="vaapi_encode"
 +mpeg2_vaapi_encoder_select="cbs_mpeg2 vaapi_encode"
 +mpeg2_v4l2m2m_decoder_deps="v4l2_m2m mpeg2_v4l2_m2m"
 +mpeg4_crystalhd_decoder_select="crystalhd"
 +mpeg4_cuvid_decoder_deps="cuda cuvid"
 +mpeg4_mediacodec_decoder_deps="mediacodec"
 +mpeg4_mmal_decoder_deps="mmal"
  mpeg4_omx_encoder_deps="omx"
- mpeg4_vdpau_decoder_deps="vdpau"
- mpeg4_vdpau_decoder_select="mpeg4_decoder"
 +mpeg4_v4l2m2m_decoder_deps="v4l2_m2m mpeg4_v4l2_m2m"
 +mpeg4_v4l2m2m_encoder_deps="v4l2_m2m mpeg4_v4l2_m2m"
- mpeg_vdpau_decoder_deps="vdpau"
- mpeg_vdpau_decoder_select="mpeg2video_decoder"
 +msmpeg4_crystalhd_decoder_select="crystalhd"
 +nvenc_h264_encoder_select="h264_nvenc_encoder"
 +nvenc_hevc_encoder_select="hevc_nvenc_encoder"
 +vc1_crystalhd_decoder_select="crystalhd"
 +vc1_cuvid_decoder_deps="cuda cuvid"
  vc1_mmal_decoder_deps="mmal"
- vc1_vdpau_decoder_deps="vdpau"
- vc1_vdpau_decoder_select="vc1_decoder"
 -vc1_qsv_decoder_deps="libmfx"
 -vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser"
 +vc1_v4l2m2m_decoder_deps="v4l2_m2m vc1_v4l2_m2m"
 +vp8_cuvid_decoder_deps="cuda cuvid"
 +vp8_mediacodec_decoder_deps="mediacodec"
  vp8_qsv_decoder_deps="libmfx"
  vp8_qsv_decoder_select="qsvdec vp8_qsv_hwaccel vp8_parser"
 +vp8_rkmpp_decoder_deps="rkmpp"
  vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8"
  vp8_vaapi_encoder_select="vaapi_encode"
 -
 -nvenc_h264_encoder_select="h264_nvenc_encoder"
 -nvenc_hevc_encoder_select="hevc_nvenc_encoder"
 +vp8_v4l2m2m_decoder_deps="v4l2_m2m vp8_v4l2_m2m"
 +vp8_v4l2m2m_encoder_deps="v4l2_m2m vp8_v4l2_m2m"
 +vp9_cuvid_decoder_deps="cuda cuvid"
 +vp9_mediacodec_decoder_deps="mediacodec"
 +vp9_rkmpp_decoder_deps="rkmpp"
 +vp9_vaapi_encoder_deps="VAEncPictureParameterBufferVP9"
 +vp9_vaapi_encoder_select="vaapi_encode"
 +vp9_v4l2m2m_decoder_deps="v4l2_m2m vp9_v4l2_m2m"
 +wmv3_crystalhd_decoder_select="crystalhd"
- wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
  
  # parsers
  h264_parser_select="golomb h264dsp h264parse"
diff --cc libavcodec/allcodecs.c
index dea1b1d13b,556bdb43f3..83691267aa
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@@ -206,18 -169,10 +206,15 @@@ static void register_all(void
      REGISTER_ENCDEC (H261,              h261);
      REGISTER_ENCDEC (H263,              h263);
      REGISTER_DECODER(H263I,             h263i);
 -    REGISTER_ENCODER(H263P,             h263p);
 +    REGISTER_ENCDEC (H263P,             h263p);
 +    REGISTER_DECODER(H263_V4L2M2M,      h263_v4l2m2m);
      REGISTER_DECODER(H264,              h264);
 +    REGISTER_DECODER(H264_CRYSTALHD,    h264_crystalhd);
 +    REGISTER_DECODER(H264_V4L2M2M,      h264_v4l2m2m);
 +    REGISTER_DECODER(H264_MEDIACODEC,   h264_mediacodec);
      REGISTER_DECODER(H264_MMAL,         h264_mmal);
      REGISTER_DECODER(H264_QSV,          h264_qsv);
 +    REGISTER_DECODER(H264_RKMPP,        h264_rkmpp);
- #if FF_API_VDPAU
-     REGISTER_DECODER(H264_VDPAU,        h264_vdpau);
- #endif
      REGISTER_ENCDEC (HAP,               hap);
      REGISTER_DECODER(HEVC,              hevc);
      REGISTER_DECODER(HEVC_QSV,          hevc_qsv);
@@@ -252,26 -205,10 +249,19 @@@
      REGISTER_DECODER(MOTIONPIXELS,      motionpixels);
      REGISTER_ENCDEC (MPEG1VIDEO,        mpeg1video);
      REGISTER_ENCDEC (MPEG2VIDEO,        mpeg2video);
 +    REGISTER_ENCDEC (MPEG4,             mpeg4);
 +    REGISTER_DECODER(MPEG4_CRYSTALHD,   mpeg4_crystalhd);
 +    REGISTER_DECODER(MPEG4_V4L2M2M,     mpeg4_v4l2m2m);
 +    REGISTER_DECODER(MPEG4_MMAL,        mpeg4_mmal);
- #if FF_API_VDPAU
-     REGISTER_DECODER(MPEG4_VDPAU,       mpeg4_vdpau);
- #endif
 +    REGISTER_DECODER(MPEGVIDEO,         mpegvideo);
- #if FF_API_VDPAU
-     REGISTER_DECODER(MPEG_VDPAU,        mpeg_vdpau);
-     REGISTER_DECODER(MPEG1_VDPAU,       mpeg1_vdpau);
- #endif
 +    REGISTER_DECODER(MPEG1_V4L2M2M,     mpeg1_v4l2m2m);
      REGISTER_DECODER(MPEG2_MMAL,        mpeg2_mmal);
 +    REGISTER_DECODER(MPEG2_CRYSTALHD,   mpeg2_crystalhd);
 +    REGISTER_DECODER(MPEG2_V4L2M2M,     mpeg2_v4l2m2m);
      REGISTER_DECODER(MPEG2_QSV,         mpeg2_qsv);
 -    REGISTER_ENCDEC (MPEG4,             mpeg4);
 +    REGISTER_DECODER(MPEG2_MEDIACODEC,  mpeg2_mediacodec);
      REGISTER_DECODER(MSA1,              msa1);
 +    REGISTER_DECODER(MSCC,              mscc);
      REGISTER_DECODER(MSMPEG4V1,         msmpeg4v1);
      REGISTER_ENCDEC (MSMPEG4V2,         msmpeg4v2);
      REGISTER_ENCDEC (MSMPEG4V3,         msmpeg4v3);
@@@ -358,10 -280,6 +348,7 @@@
      REGISTER_DECODER(VB,                vb);
      REGISTER_DECODER(VBLE,              vble);
      REGISTER_DECODER(VC1,               vc1);
 +    REGISTER_DECODER(VC1_CRYSTALHD,     vc1_crystalhd);
- #if FF_API_VDPAU
-     REGISTER_DECODER(VC1_VDPAU,         vc1_vdpau);
- #endif
      REGISTER_DECODER(VC1IMAGE,          vc1image);
      REGISTER_DECODER(VC1_MMAL,          vc1_mmal);
      REGISTER_DECODER(VC1_QSV,           vc1_qsv);
@@@ -389,10 -301,6 +376,7 @@@
      REGISTER_ENCDEC (WMV1,              wmv1);
      REGISTER_ENCDEC (WMV2,              wmv2);
      REGISTER_DECODER(WMV3,              wmv3);
 +    REGISTER_DECODER(WMV3_CRYSTALHD,    wmv3_crystalhd);
- #if FF_API_VDPAU
-     REGISTER_DECODER(WMV3_VDPAU,        wmv3_vdpau);
- #endif
      REGISTER_DECODER(WMV3IMAGE,         wmv3image);
      REGISTER_DECODER(WNV1,              wnv1);
      REGISTER_DECODER(XAN_WC3,           xan_wc3);
diff --cc libavcodec/h264dec.c
index 5abaaabf9d,2a532a7ef7..4216b66684
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@@ -50,19 -47,14 +50,19 @@@
  #include "mathops.h"
  #include "me_cmp.h"
  #include "mpegutils.h"
++#include "mpeg4video.h"
  #include "profiles.h"
  #include "rectangle.h"
  #include "thread.h"
- #include "vdpau_compat.h"
  
 -#include <assert.h>
 -
  const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 };
  
 +int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx)
 +{
 +    H264Context *h = avctx->priv_data;
 +    return h && h->ps.sps ? h->ps.sps->num_reorder_frames : 0;
 +}
 +
  static void h264_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
                                int (*mv)[2][4][2],
                                int mb_x, int mb_y, int mb_intra, int mb_skipped)
diff --cc libavcodec/mpeg12dec.c
index f102246f52,6702ad1ed7..82bb1286ff
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@@ -47,8 -45,6 +47,7 @@@
  #include "profiles.h"
  #include "thread.h"
  #include "version.h"
- #include "vdpau_compat.h"
 +#include "xvmc_internal.h"
  
  typedef struct Mpeg1Context {
      MpegEncContext mpeg_enc_ctx;
@@@ -1130,30 -1105,7 +1129,24 @@@ static void quant_matrix_rebuild(uint16
          matrix[new_perm[i]] = temp_matrix[old_perm[i]];
  }
  
 -static const enum AVPixelFormat mpeg12_hwaccel_pixfmt_list_420[] = {
 +static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
 +#if CONFIG_MPEG1_XVMC_HWACCEL
 +    AV_PIX_FMT_XVMC,
 +#endif
- #if CONFIG_MPEG1_VDPAU_DECODER && FF_API_VDPAU
-     AV_PIX_FMT_VDPAU_MPEG1,
- #endif
 +#if CONFIG_MPEG1_VDPAU_HWACCEL
 +    AV_PIX_FMT_VDPAU,
 +#endif
 +    AV_PIX_FMT_YUV420P,
 +    AV_PIX_FMT_NONE
 +};
 +
 +static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
 +#if CONFIG_MPEG2_XVMC_HWACCEL
 +    AV_PIX_FMT_XVMC,
 +#endif
- #if CONFIG_MPEG_VDPAU_DECODER && FF_API_VDPAU
-     AV_PIX_FMT_VDPAU_MPEG2,
- #endif
 +#if CONFIG_MPEG2_VDPAU_HWACCEL
 +    AV_PIX_FMT_VDPAU,
 +#endif
  #if CONFIG_MPEG2_DXVA2_HWACCEL
      AV_PIX_FMT_DXVA2_VLD,
  #endif
@@@ -1205,26 -1145,7 +1192,22 @@@ static enum AVPixelFormat mpeg_get_pixe
      else
          pix_fmts = mpeg12_pixfmt_list_444;
  
 -    return ff_get_format(avctx, pix_fmts);
 +    return ff_thread_get_format(avctx, pix_fmts);
 +}
 +
 +static void setup_hwaccel_for_pixfmt(AVCodecContext *avctx)
 +{
 +    // until then pix_fmt may be changed right after codec init
-     if (avctx->hwaccel
- #if FF_API_VDPAU
-         || uses_vdpau(avctx)
- #endif
-         )
++    if (avctx->hwaccel)
 +        if (avctx->idct_algo == FF_IDCT_AUTO)
 +            avctx->idct_algo = FF_IDCT_NONE;
 +
 +    if (avctx->hwaccel && avctx->pix_fmt == AV_PIX_FMT_XVMC) {
 +        Mpeg1Context *s1 = avctx->priv_data;
 +        MpegEncContext *s = &s1->mpeg_enc_ctx;
 +
 +        s->pack_pblocks = 1;
 +    }
  }
  
  /* Call this function when we know all parameters.
@@@ -2883,56 -2608,6 +2853,24 @@@ AVCodec ff_mpeg2video_decoder = 
      .capabilities   = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
                        AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY |
                        AV_CODEC_CAP_SLICE_THREADS,
 +    .caps_internal  = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
      .flush          = flush,
 +    .max_lowres     = 3,
      .profiles       = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles),
  };
 +
 +//legacy decoder
 +AVCodec ff_mpegvideo_decoder = {
 +    .name           = "mpegvideo",
 +    .long_name      = NULL_IF_CONFIG_SMALL("MPEG-1 video"),
 +    .type           = AVMEDIA_TYPE_VIDEO,
 +    .id             = AV_CODEC_ID_MPEG2VIDEO,
 +    .priv_data_size = sizeof(Mpeg1Context),
 +    .init           = mpeg_decode_init,
 +    .close          = mpeg_decode_end,
 +    .decode         = mpeg_decode_frame,
 +    .capabilities   = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS,
 +    .caps_internal  = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
 +    .flush          = flush,
 +    .max_lowres     = 3,
 +};
- 
- #if CONFIG_MPEG_VDPAU_DECODER && FF_API_VDPAU
- AVCodec ff_mpeg_vdpau_decoder = {
-     .name           = "mpegvideo_vdpau",
-     .long_name      = NULL_IF_CONFIG_SMALL("MPEG-1/2 video (VDPAU acceleration)"),
-     .type           = AVMEDIA_TYPE_VIDEO,
-     .id             = AV_CODEC_ID_MPEG2VIDEO,
-     .priv_data_size = sizeof(Mpeg1Context),
-     .init           = mpeg_decode_init,
-     .close          = mpeg_decode_end,
-     .decode         = mpeg_decode_frame,
-     .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED |
-                       AV_CODEC_CAP_HWACCEL_VDPAU | AV_CODEC_CAP_DELAY,
-     .flush          = flush,
- };
- #endif
- 
- #if CONFIG_MPEG1_VDPAU_DECODER && FF_API_VDPAU
- AVCodec ff_mpeg1_vdpau_decoder = {
-     .name           = "mpeg1video_vdpau",
-     .long_name      = NULL_IF_CONFIG_SMALL("MPEG-1 video (VDPAU acceleration)"),
-     .type           = AVMEDIA_TYPE_VIDEO,
-     .id             = AV_CODEC_ID_MPEG1VIDEO,
-     .priv_data_size = sizeof(Mpeg1Context),
-     .init           = mpeg_decode_init,
-     .close          = mpeg_decode_end,
-     .decode         = mpeg_decode_frame,
-     .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED |
-                       AV_CODEC_CAP_HWACCEL_VDPAU | AV_CODEC_CAP_DELAY,
-     .flush          = flush,
- };
- #endif
diff --cc libavcodec/mpeg4videodec.c
index cd39131d55,8891ec1bb7..82c4f8fc8c
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@@ -2843,31 -2625,4 +2843,5 @@@ AVCodec ff_mpeg4_decoder = 
      .pix_fmts              = ff_h263_hwaccel_pixfmt_list_420,
      .profiles              = NULL_IF_CONFIG_SMALL(ff_mpeg4_video_profiles),
      .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg4_update_thread_context),
 +    .priv_class = &mpeg4_class,
  };
- 
- 
- #if CONFIG_MPEG4_VDPAU_DECODER && FF_API_VDPAU
- static const AVClass mpeg4_vdpau_class = {
-     "MPEG4 Video VDPAU Decoder",
-     av_default_item_name,
-     mpeg4_options,
-     LIBAVUTIL_VERSION_INT,
- };
- 
- AVCodec ff_mpeg4_vdpau_decoder = {
-     .name           = "mpeg4_vdpau",
-     .long_name      = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"),
-     .type           = AVMEDIA_TYPE_VIDEO,
-     .id             = AV_CODEC_ID_MPEG4,
-     .priv_data_size = sizeof(Mpeg4DecContext),
-     .init           = decode_init,
-     .close          = ff_h263_decode_end,
-     .decode         = ff_h263_decode_frame,
-     .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY |
-                       AV_CODEC_CAP_HWACCEL_VDPAU,
-     .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_MPEG4,
-                                                   AV_PIX_FMT_NONE },
-     .priv_class     = &mpeg4_vdpau_class,
- };
- #endif
diff --cc libavcodec/vc1dec.c
index b68115613a,89b4f4bdce..6bdaeca98e
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@@ -37,9 -37,6 +37,8 @@@
  #include "profiles.h"
  #include "vc1.h"
  #include "vc1data.h"
- #include "vdpau_compat.h"
 +#include "libavutil/avassert.h"
 +
  
  #if CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER
  
diff --cc libavcodec/vdpau.c
index 7053dd162a,68d0813f65..ee3610428f
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@@ -28,17 -28,8 +28,11 @@@
  #include "h264dec.h"
  #include "vc1.h"
  #include "vdpau.h"
- #include "vdpau_compat.h"
  #include "vdpau_internal.h"
  
 +// XXX: at the time of adding this ifdefery, av_assert* wasn't use outside.
 +// When dropping it, make sure other av_assert* were not added since then.
 +
- #if FF_API_VDPAU
- #undef NDEBUG
- #include <assert.h>
- #endif
- 
  /**
   * @addtogroup VDPAU_Decoding
   *
diff --cc libavutil/pixfmt.h
index 6b6b4ae0fb,3c670fc9d4..a520028962
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@@ -137,15 -120,12 +130,12 @@@ enum AVPixelFormat 
      AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
      AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
      AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
- #if FF_API_VDPAU
-     AV_PIX_FMT_VDPAU_MPEG4,  ///< MPEG-4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- #endif
      AV_PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
  
 -    AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
 -    AV_PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
 -    AV_PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
 -    AV_PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
 +    AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), little-endian, X=unused/undefined
 +    AV_PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), big-endian,    X=unused/undefined
 +    AV_PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), little-endian, X=unused/undefined
 +    AV_PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), big-endian,    X=unused/undefined
      AV_PIX_FMT_YA8,       ///< 8 bits gray, 8 bits alpha
  
      AV_PIX_FMT_Y400A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8



More information about the ffmpeg-cvslog mailing list