Merge commit '5c1585c4c3b5281835d784c5daef0069915ccd57'

* commit '5c1585c4c3b5281835d784c5daef0069915ccd57':
  lavc: Drop deprecated VDPAU buffer fields

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

diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 4cc51cb79ed12f99b0dce1e31d820f2f8b6735f6..7053dd162a5e51a03c8ef03673918a199a97f96a 100644 (file)
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -33,9 +33,6 @@
 
 // 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_BUFS_VDPAU
-#include "libavutil/avassert.h"
-#endif
 
 #if FF_API_VDPAU
 #undef NDEBUG
@@ -353,18 +350,6 @@ int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame,
     if (val < 0)
         return val;
 
-#if FF_API_BUFS_VDPAU
-FF_DISABLE_DEPRECATION_WARNINGS
-    if (hwctx) {
-    av_assert0(sizeof(hwctx->info) <= sizeof(pic_ctx->info));
-    memcpy(&hwctx->info, &pic_ctx->info, sizeof(hwctx->info));
-    hwctx->bitstream_buffers = pic_ctx->bitstream_buffers;
-    hwctx->bitstream_buffers_used = pic_ctx->bitstream_buffers_used;
-    hwctx->bitstream_buffers_allocated = pic_ctx->bitstream_buffers_allocated;
-    }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
     if (hwctx && !hwctx->render && hwctx->render2) {
         status = hwctx->render2(avctx, frame, (void *)&pic_ctx->info,
                                 pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers);
@@ -375,16 +360,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
     av_freep(&pic_ctx->bitstream_buffers);
 
-#if FF_API_BUFS_VDPAU
-FF_DISABLE_DEPRECATION_WARNINGS
-    if (hwctx) {
-    hwctx->bitstream_buffers = NULL;
-    hwctx->bitstream_buffers_used = 0;
-    hwctx->bitstream_buffers_allocated = 0;
-    }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
     return vdpau_error(status);
 }
 

diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 458e4fa605e3eff18b7c237a1277c3ea35e91d7b..4d9994336911865d839731c6d360102e9eaa27cc 100644 (file)
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -57,15 +57,6 @@
 #include "avcodec.h"
 #include "version.h"
 
-#if FF_API_BUFS_VDPAU
-union AVVDPAUPictureInfo {
-    VdpPictureInfoH264        h264;
-    VdpPictureInfoMPEG1Or2    mpeg;
-    VdpPictureInfoVC1          vc1;
-    VdpPictureInfoMPEG4Part2 mpeg4;
-};
-#endif
-
 struct AVCodecContext;
 struct AVFrame;
 
@@ -102,40 +93,6 @@ typedef struct AVVDPAUContext {
      */
     VdpDecoderRender *render;
 
-#if FF_API_BUFS_VDPAU
-    /**
-     * VDPAU picture information
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    union AVVDPAUPictureInfo info;
-
-    /**
-     * Allocated size of the bitstream_buffers table.
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    int bitstream_buffers_allocated;
-
-    /**
-     * Useful bitstream buffers in the bitstream buffers table.
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    int bitstream_buffers_used;
-
-   /**
-     * Table of bitstream buffers.
-     * The user is responsible for freeing this buffer using av_freep().
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    VdpBitstreamBuffer *bitstream_buffers;
-#endif
     AVVDPAU_Render2 render2;
 } AVVDPAUContext;
 

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 0335a2868c080b3dcf0f503cc0d23109d7a0b848..55b7cfff118b8a600f3b6afcb7dbf2e43c11f305 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,9 +57,6 @@
 #ifndef FF_API_LOWRES
 #define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_BUFS_VDPAU
-#define FF_API_BUFS_VDPAU        (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_VOXWARE
 #define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif