[FFmpeg-cvslog] nvenc: rename a misnamed function

Anton Khirnov git at videolan.org
Tue Feb 16 20:50:19 CET 2016


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Jan 30 22:13:04 2016 +0100| [d005ccc630e42daab8ec2afecf972d1551a9401a] | committer: Anton Khirnov

nvenc: rename a misnamed function

This function copies the encoded bistream into the caller's packet,
calling it 'get_frame' is misleading.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d005ccc630e42daab8ec2afecf972d1551a9401a
---

 libavcodec/nvenc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index caf683e..0783c35 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -1052,7 +1052,7 @@ static int nvenc_set_timestamp(AVCodecContext *avctx,
     return nvenc_dequeue_timestamp(ctx->timestamps, &pkt->dts);
 }
 
-static int nvenc_get_frame(AVCodecContext *avctx, AVPacket *pkt)
+static int nvenc_get_output(AVCodecContext *avctx, AVPacket *pkt)
 {
     NVENCContext *ctx               = avctx->priv_data;
     NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs;
@@ -1196,7 +1196,7 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     }
 
     if (output_ready(avctx, !frame)) {
-        ret = nvenc_get_frame(avctx, pkt);
+        ret = nvenc_get_output(avctx, pkt);
         if (ret < 0)
             return ret;
         *got_packet = 1;



More information about the ffmpeg-cvslog mailing list