---
libavcodec/dxva2.c | 8 ++++----
libavcodec/dxva2_internal.h | 2 --
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c
index 04a9c11..2ac3f3e 100644
--- a/libavcodec/dxva2.c
+++ b/libavcodec/dxva2.c
@@ -29,7 +29,7 @@
#include "avcodec.h"
#include "dxva2_internal.h"
-void *ff_dxva2_get_surface(const AVFrame *frame)
+static void *get_surface(const AVFrame *frame)
{
return frame->data[3];
}
@@ -38,7 +38,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext
*avctx,
const AVDXVAContext *ctx,
const AVFrame *frame)
{
- void *surface = ff_dxva2_get_surface(frame);
+ void *surface = get_surface(frame);
unsigned i;
for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) {
@@ -159,14 +159,14 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx,
AVFrame *frame,
if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE)
WaitForSingleObjectEx(D3D11VA_CONTEXT(ctx)->context_mutex,
INFINITE, FALSE);
hr =
ID3D11VideoContext_DecoderBeginFrame(D3D11VA_CONTEXT(ctx)->video_context,
D3D11VA_CONTEXT(ctx)->decoder,
-
ff_dxva2_get_surface(frame),
+ get_surface(frame),
0, NULL);
}
#endif
#if CONFIG_DXVA2
if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
hr = IDirectXVideoDecoder_BeginFrame(DXVA2_CONTEXT(ctx)->decoder,
- ff_dxva2_get_surface(frame),
+ get_surface(frame),
NULL);
#endif
if (hr != E_PENDING || ++runs > 50)
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index 24adb99..c962810 100644
--- a/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@ -96,8 +96,6 @@ typedef union {
#define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx)
(ctx->d3d11va.cfg->ConfigResidDiffAccelerator)
#endif
-void *ff_dxva2_get_surface(const AVFrame *frame);
-
unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
const AVDXVAContext *,
const AVFrame *frame);
--
2.10.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
