OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a30fd82
)
libx265: Pass through user-set frame type
author
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Wed, 21 Jan 2015 15:16:18 +0000
(15:16 +0000)
committer
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Thu, 22 Jan 2015 16:30:27 +0000
(16:30 +0000)
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/libx265.c
patch
|
blob
|
history
diff --git
a/libavcodec/libx265.c
b/libavcodec/libx265.c
index
923c750
..
aee7ae2
100644
(file)
--- 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,