From: Timo Rothenpieler <timo@rothenpieler.org>
Date: Mon, 8 May 2017 16:39:40 +0000 (+0200)
Subject: avcodec/nvenc: remove usage of deprecated fields
X-Git-Tag: android-x86-7.1-r1~434
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=23538ad2eb76a0d27a1f2b2bcdccd857124a0224;p=android-x86%2Fexternal-ffmpeg.git

avcodec/nvenc: remove usage of deprecated fields
---

diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 1d19a6bcce..0a625512c0 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -1132,7 +1132,6 @@ static av_cold int nvenc_alloc_surface(AVCodecContext *avctx, int idx)
         allocSurf.version = NV_ENC_CREATE_INPUT_BUFFER_VER;
         allocSurf.width = (avctx->width + 31) & ~31;
         allocSurf.height = (avctx->height + 31) & ~31;
-        allocSurf.memoryHeap = NV_ENC_MEMORY_HEAP_SYSMEM_CACHED;
         allocSurf.bufferFmt = ctx->surfaces[idx].format;
 
         nv_status = p_nvenc->nvEncCreateInputBuffer(ctx->nvencoder, &allocSurf);
@@ -1145,12 +1144,6 @@ static av_cold int nvenc_alloc_surface(AVCodecContext *avctx, int idx)
         ctx->surfaces[idx].height = allocSurf.height;
     }
 
-    /* 1MB is large enough to hold most output frames.
-     * NVENC increases this automaticaly if it is not enough. */
-    allocOut.size = 1024 * 1024;
-
-    allocOut.memoryHeap = NV_ENC_MEMORY_HEAP_SYSMEM_CACHED;
-
     nv_status = p_nvenc->nvEncCreateBitstreamBuffer(ctx->nvencoder, &allocOut);
     if (nv_status != NV_ENC_SUCCESS) {
         int err = nvenc_print_error(avctx, nv_status, "CreateBitstreamBuffer failed");