diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-24 10:22:05 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-07-01 00:40:02 +0200 |
| commit | bf13a177d2dd8be5287541d0115b303e861241ad (patch) | |
| tree | 9a75290229ecbaaf5f405dc7d50278bd2ad23e83 | |
| parent | e9f2eb198bc4b2a623385ba55b169e0f975ccb87 (diff) | |
avcodec/libx264: Avoid duplicating strings
Also removes some unchecked allocations.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/libx264.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 616d855067..98ec030865 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -62,7 +62,8 @@ typedef struct X264Context { int sei_size; char *preset; char *tune; - char *profile; + const char *profile; + char *profile_opt; char *level; int fastfirstpass; char *wpredp; @@ -832,26 +833,27 @@ static av_cold int X264_init(AVCodecContext *avctx) if (x4->fastfirstpass) x264_param_apply_fastfirstpass(&x4->params); + x4->profile = x4->profile_opt; /* Allow specifying the x264 profile through AVCodecContext. */ if (!x4->profile) switch (avctx->profile) { case FF_PROFILE_H264_BASELINE: - x4->profile = av_strdup("baseline"); + x4->profile = "baseline"; break; case FF_PROFILE_H264_HIGH: - x4->profile = av_strdup("high"); + x4->profile = "high"; break; case FF_PROFILE_H264_HIGH_10: - x4->profile = av_strdup("high10"); + x4->profile = "high10"; break; case FF_PROFILE_H264_HIGH_422: - x4->profile = av_strdup("high422"); + x4->profile = "high422"; break; case FF_PROFILE_H264_HIGH_444: - x4->profile = av_strdup("high444"); + x4->profile = "high444"; break; case FF_PROFILE_H264_MAIN: - x4->profile = av_strdup("main"); + x4->profile = "main"; break; default: break; @@ -1098,7 +1100,7 @@ static av_cold void X264_init_static(FFCodec *codec) static const AVOption options[] = { { "preset", "Set the encoding preset (cf. x264 --fullhelp)", OFFSET(preset), AV_OPT_TYPE_STRING, { .str = "medium" }, 0, 0, VE}, { "tune", "Tune the encoding params (cf. x264 --fullhelp)", OFFSET(tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE}, - { "profile", "Set profile restrictions (cf. x264 --fullhelp) ", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE}, + { "profile", "Set profile restrictions (cf. x264 --fullhelp)", OFFSET(profile_opt), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE}, { "fastfirstpass", "Use fast settings when encoding first pass", OFFSET(fastfirstpass), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE}, {"level", "Specify level (as defined by Annex A)", OFFSET(level), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE}, {"passlogfile", "Filename for 2 pass stats", OFFSET(stats), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE}, |