diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 12:10:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 12:10:09 +0200 |
| commit | eacf42dd50885936ae05dd7fd415c4544b9f41cf (patch) | |
| tree | 2e7981e2b13e4635d1eef87b8b9f1ebc8e2ade42 | |
| parent | 928cb84b32b639841ac1ec2957155a6abd53309f (diff) | |
| parent | 4912b634b517c8acfc476c5d47f10be83fe7e18b (diff) | |
| download | ffmpeg-eacf42dd50885936ae05dd7fd415c4544b9f41cf.tar.gz | |
Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'
* commit '4912b634b517c8acfc476c5d47f10be83fe7e18b':
x265: Use the encoder defaults
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libx265.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 4cf8c85729..55019d4768 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -299,6 +299,11 @@ static const AVClass class = { .version = LIBAVUTIL_VERSION_INT, }; +static const AVCodecDefault x265_defaults[] = { + { "b", "0" }, + { NULL }, +}; + AVCodec ff_libx265_encoder = { .name = "libx265", .long_name = NULL_IF_CONFIG_SMALL("libx265 H.265 / HEVC"), @@ -310,5 +315,6 @@ AVCodec ff_libx265_encoder = { .close = libx265_encode_close, .priv_data_size = sizeof(libx265Context), .priv_class = &class, + .defaults = x265_defaults, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, }; |