dxva2: make ff_dxva2_get_surface() static and rename it
authorSteve Lhomme <robux4@gmail.com>
Wed, 4 Jan 2017 13:36:41 +0000 (14:36 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 5 Jan 2017 22:18:36 +0000 (23:18 +0100)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/dxva2.c
libavcodec/dxva2_internal.h

index 04a9c11..2ac3f3e 100644 (file)
@@ -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)
index 24adb99..c962810 100644 (file)
@@ -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);