diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2020-06-30 19:03:56 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2020-06-30 19:03:56 +0200 |
| commit | 9aef4ae97599c61845ed76d37e81e5a8c4b266ff (patch) | |
| tree | 6f3687c5721086487157d775a903680fb25a54b4 | |
| parent | b11ed975996d960e962af8a4f3cc646dea9094f4 (diff) | |
avcodec/nvenc: rename tc option to something more unique
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
| -rw-r--r-- | libavcodec/nvenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/nvenc.h | 2 | ||||
| -rw-r--r-- | libavcodec/nvenc_hevc.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index b957b9cb7c..0981262491 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -2154,7 +2154,7 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) } } - if (ctx->tc && av_frame_get_side_data(frame, AV_FRAME_DATA_S12M_TIMECODE)) { + if (ctx->s12m_tc && av_frame_get_side_data(frame, AV_FRAME_DATA_S12M_TIMECODE)) { void *tc_data = NULL; size_t tc_size = 0; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index b67abcaf18..df0d9caf9c 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -196,7 +196,7 @@ typedef struct NvencContext int coder; int b_ref_mode; int a53_cc; - int tc; + int s12m_tc; int dpb_size; } NvencContext; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 1924e4b148..a90dd51f5f 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -130,7 +130,7 @@ static const AVOption options[] = { { "middle", "", 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, VE, "b_ref_mode" }, #endif { "a53cc", "Use A53 Closed Captions (if available)", OFFSET(a53_cc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, - { "tc", "Use timecode (if available)", OFFSET(tc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, + { "s12m_tc", "Use timecode (if available)", OFFSET(s12m_tc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, { "dpb_size", "Specifies the DPB size used for encoding (0 means automatic)", OFFSET(dpb_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { NULL } diff --git a/libavcodec/version.h b/libavcodec/version.h index 03593026b3..05f59901ff 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 93 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |