diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-01-21 15:16:18 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-01-22 16:29:30 +0000 |
| commit | 6341ab0ad3fde9583138e121f518e21cde15258e (patch) | |
| tree | 95295ffb676218a321a50da3e5280ead6a440f0a | |
| parent | 3a724a7f3ba7fa766c6a6f0924a15cc742031b8d (diff) | |
| download | ffmpeg-6341ab0ad3fde9583138e121f518e21cde15258e.tar.gz | |
libx265: Pass through user-set frame type
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavcodec/libx265.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index a3bf2dc0b4..e6931bdf80 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, |