[FFmpeg-devel] [PATCH 2/3] avcodec/libx264:setting profile and level in avcodec context
vdixit at akamai.com
vdixit at akamai.com
Thu Nov 23 05:37:35 EET 2017
From: Vishwanath Dixit <vdixit at akamai.com>
Signed-off-by: Karthick J <kjeyapal at akamai.com>
---
libavcodec/libx264.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 9c67c91..eeafe31 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -454,6 +454,9 @@ static av_cold int X264_init(AVCodecContext *avctx)
X264Context *x4 = avctx->priv_data;
AVCPBProperties *cpb_props;
int sw,sh;
+ x264_nal_t *nal;
+ uint8_t *p;
+ int nnal, s, i;
if (avctx->global_quality > 0)
av_log(avctx, AV_LOG_WARNING, "-qscale is ignored, -crf is recommended.\n");
@@ -799,12 +802,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (!x4->enc)
return AVERROR_EXTERNAL;
- if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
- x264_nal_t *nal;
- uint8_t *p;
- int nnal, s, i;
+ s = x264_encoder_headers(x4->enc, &nal, &nnal);
+ if (avctx->profile == FF_PROFILE_UNKNOWN)
+ avctx->profile = nal->p_payload[5];
+ if (avctx->level == FF_LEVEL_UNKNOWN)
+ avctx->level = nal->p_payload[7];
- s = x264_encoder_headers(x4->enc, &nal, &nnal);
+ if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
avctx->extradata = p = av_mallocz(s + AV_INPUT_BUFFER_PADDING_SIZE);
if (!p)
return AVERROR(ENOMEM);
--
1.9.1
More information about the ffmpeg-devel
mailing list