From: Derek Buitenhuis Date: Wed, 21 Jan 2015 15:16:18 +0000 (+0000) Subject: libx265: Pass through user-set frame type X-Git-Tag: android-x86-6.0-r1~814 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=41e983f1a63927dc0a2596cf2f0f7a946a048f11;p=android-x86%2Fexternal-ffmpeg.git libx265: Pass through user-set frame type Signed-off-by: Derek Buitenhuis --- diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 923c750679..aee7ae2274 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -224,6 +224,11 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, x265pic.pts = pic->pts; x265pic.bitDepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1; + + x265pic.sliceType = pic->pict_type == AV_PICTURE_TYPE_I ? X265_TYPE_I : + pic->pict_type == AV_PICTURE_TYPE_P ? X265_TYPE_P : + pic->pict_type == AV_PICTURE_TYPE_B ? X265_TYPE_B : + X265_TYPE_AUTO; } ret = x265_encoder_encode(ctx->encoder, &nal, &nnal,