xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-27 21:40:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libx265: Support API version 9

Browse Source 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2014-03-06 20:01:17 +00:00
parent b66382101c
commit d67dbfa7c1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -3980,8 +3980,8 @@ enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &
{ check_cpp_condition x264.h "X264_BUILD >= 118" || { check_cpp_condition x264.h "X264_BUILD >= 118" ||
die "ERROR: libx264 version must be >= 0.118."; } die "ERROR: libx264 version must be >= 0.118."; }
enabled libx265 && require_pkg_config x265 x265.h x265_encoder_encode && enabled libx265 && require_pkg_config x265 x265.h x265_encoder_encode &&
{ check_cpp_condition x265.h "X265_BUILD >= 7" || { check_cpp_condition x265.h "X265_BUILD >= 9" ||
die "ERROR: libx265 version must be >= 7."; } die "ERROR: libx265 version must be >= 9."; }
enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto || enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||

10
libavcodec/libx265.c
View File

@ -121,11 +121,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
av_reduce(&sar_num, &sar_den, av_reduce(&sar_num, &sar_den,
avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.num,
avctx->sample_aspect_ratio.den, 4096); avctx->sample_aspect_ratio.den, 4096);
ctx->params->bEnableVuiParametersPresentFlag = 1; ctx->params->vui.bEnableVuiParametersPresentFlag = 1;
ctx->params->bEnableAspectRatioIdc = 1; ctx->params->vui.bEnableAspectRatioIdc = 1;
ctx->params->aspectRatioIdc = 255; ctx->params->vui.aspectRatioIdc = 255;
ctx->params->sarWidth = sar_num; ctx->params->vui.sarWidth = sar_num;
ctx->params->sarHeight = sar_den; ctx->params->vui.sarHeight = sar_den;
if (x265_max_bit_depth == 8) if (x265_max_bit_depth == 8)
ctx->params->internalBitDepth = 8; ctx->params->internalBitDepth = 8;