highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '5c1585c4c3b5281835d784c5daef0069915ccd57'

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-21 23:48:29 -03:00
commit 17487f11bb
3 changed files with 0 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/vdpau.c
View File

@ -33,9 +33,6 @@
// XXX: at the time of adding this ifdefery, av_assert* wasn't use outside. // 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. // 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 #if FF_API_VDPAU
#undef NDEBUG #undef NDEBUG
@ -353,18 +350,6 @@ int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame,
if (val < 0) if (val < 0)
return val; 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) { if (hwctx && !hwctx->render && hwctx->render2) {
status = hwctx->render2(avctx, frame, (void *)&pic_ctx->info, status = hwctx->render2(avctx, frame, (void *)&pic_ctx->info,
pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers);
@ -375,16 +360,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_freep(&pic_ctx->bitstream_buffers); 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); return vdpau_error(status);
} }

43
libavcodec/vdpau.h
View File

@ -57,15 +57,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "version.h" #include "version.h"
#if FF_API_BUFS_VDPAU
union AVVDPAUPictureInfo {
VdpPictureInfoH264 h264;
VdpPictureInfoMPEG1Or2 mpeg;
VdpPictureInfoVC1 vc1;
VdpPictureInfoMPEG4Part2 mpeg4;
};
#endif
struct AVCodecContext; struct AVCodecContext;
struct AVFrame; struct AVFrame;
@ -102,40 +93,6 @@ typedef struct AVVDPAUContext {
*/ */
VdpDecoderRender *render; 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; AVVDPAU_Render2 render2;
} AVVDPAUContext; } AVVDPAUContext;

3
libavcodec/version.h
View File

@ -57,9 +57,6 @@
#ifndef FF_API_LOWRES #ifndef FF_API_LOWRES
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59) #define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
#endif #endif
#ifndef FF_API_BUFS_VDPAU
#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_VOXWARE #ifndef FF_API_VOXWARE
#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 58) #define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif #endif