videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b' 

* commit '4912b634b517c8acfc476c5d47f10be83fe7e18b':
  x265: Use the encoder defaults

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-03 12:10:01 +02:00
parent 928cb84b32 4912b634b5
commit eacf42dd50
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libx265.c
View File

@ -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,
};