[FFmpeg-cvslog] avcodec/nvenc: Rename nvenc_h265 to nvenc_hevc

[Philip Langdale]

ffmpeg | branch: master | Philip Langdale <philipl at overt.org> | Sat Jun  6 11:00:45 2015 -0700| [e79c40fe72475a37db44849c1e1399b593dcaffd] | committer: Philip Langdale

avcodec/nvenc: Rename nvenc_h265 to nvenc_hevc

For the sake of compatibility, and because pretty much everything else in the
codebase calls it HEVC.

Signed-off-by: Philip Langdale <philipl at overt.org>

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

 Changelog              |    2 +-
 configure              |    2 +-
 libavcodec/allcodecs.c |    2 +-
 libavcodec/nvenc.c     |   18 +++++++++---------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Changelog b/Changelog
index c73f1dd..9844096 100644
--- a/Changelog
+++ b/Changelog
@@ -8,7 +8,7 @@ version <next>:
 - showwavespic filter
 - DTS decoding through libdcadec
 - Drop support for nvenc API before 5.0
-- nvenc H265 encoder
+- nvenc HEVC encoder
 - Detelecine filter
 - Intel QSV-accelerated H.264 encoding
 - MMAL-accelerated H.264 decoding
diff --git a/configure b/configure
index c724886..8290591 100755
--- a/configure
+++ b/configure
@@ -2485,7 +2485,7 @@ libutvideo_decoder_deps="libutvideo"
 libutvideo_encoder_deps="libutvideo"
 libzvbi_teletext_decoder_deps="libzvbi"
 nvenc_encoder_deps="nvenc"
-nvenc_h265_encoder_deps="nvenc"
+nvenc_hevc_encoder_deps="nvenc"
 
 # demuxers / muxers
 ac3_demuxer_select="ac3_parser"
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index a94d1dc..e873705 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -236,7 +236,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(MXPEG,             mxpeg);
     REGISTER_DECODER(NUV,               nuv);
     REGISTER_ENCODER(NVENC,             nvenc);
-    REGISTER_ENCODER(NVENC_H265,        nvenc_h265);
+    REGISTER_ENCODER(NVENC_HEVC,        nvenc_hevc);
     REGISTER_DECODER(PAF_VIDEO,         paf_video);
     REGISTER_ENCDEC (PAM,               pam);
     REGISTER_ENCDEC (PBM,               pbm);
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 0a418a7..246f6a1 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -192,7 +192,7 @@ static const NvencValuePair nvenc_h264_level_pairs[] = {
     { NULL }
 };
 
-static const NvencValuePair nvenc_h265_level_pairs[] = {
+static const NvencValuePair nvenc_hevc_level_pairs[] = {
     { "auto", NV_ENC_LEVEL_AUTOSELECT },
     { "1"   , NV_ENC_LEVEL_HEVC_1     },
     { "1.0" , NV_ENC_LEVEL_HEVC_1     },
@@ -870,7 +870,7 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
         avctx->profile = FF_PROFILE_HEVC_MAIN;
 
         if (ctx->level) {
-            res = input_string_to_uint32(avctx, nvenc_h265_level_pairs, ctx->level, &ctx->encode_config.encodeCodecConfig.hevcConfig.level);
+            res = input_string_to_uint32(avctx, nvenc_hevc_level_pairs, ctx->level, &ctx->encode_config.encodeCodecConfig.hevcConfig.level);
 
             if (res) {
                 av_log(avctx, AV_LOG_FATAL, "Level \"%s\" is unknown! Supported levels: auto, 1, 2, 2.1, 3, 3.1, 4, 4.1, 5, 5.1, 5.2, 6, 6.1, 6.2\n", ctx->level);
@@ -1427,17 +1427,17 @@ AVCodec ff_nvenc_encoder = {
 };
 #endif
 
-#if CONFIG_NVENC_H265_ENCODER
-static const AVClass nvenc_h265_class = {
-    .class_name = "nvenc_h265",
+#if CONFIG_NVENC_HEVC_ENCODER
+static const AVClass nvenc_hevc_class = {
+    .class_name = "nvenc_hevc",
     .item_name = av_default_item_name,
     .option = options,
     .version = LIBAVUTIL_VERSION_INT,
 };
 
-AVCodec ff_nvenc_h265_encoder = {
-    .name = "nvenc_h265",
-    .long_name = NULL_IF_CONFIG_SMALL("Nvidia NVENC h265 encoder"),
+AVCodec ff_nvenc_hevc_encoder = {
+    .name = "nvenc_hevc",
+    .long_name = NULL_IF_CONFIG_SMALL("Nvidia NVENC hevc encoder"),
     .type = AVMEDIA_TYPE_VIDEO,
     .id = AV_CODEC_ID_H265,
     .priv_data_size = sizeof(NvencContext),
@@ -1445,7 +1445,7 @@ AVCodec ff_nvenc_h265_encoder = {
     .encode2 = nvenc_encode_frame,
     .close = nvenc_encode_close,
     .capabilities = CODEC_CAP_DELAY,
-    .priv_class = &nvenc_h265_class,
+    .priv_class = &nvenc_hevc_class,
     .defaults = nvenc_defaults,
     .pix_fmts = pix_fmts_nvenc,
 };