MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/libx264: set supported pix_fmts at runtime rather than build time

Browse Source 
This partially reverts a change in behavior introduced in 2a111c99a6.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-12-26 19:40:27 -03:00
parent e6a1dfc9ce
commit 7e60c74329
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/libx264.c
View File

@ -895,14 +895,16 @@ static const enum AVPixelFormat pix_fmts_8bit_rgb[] = {
static av_cold void X264_init_static(AVCodec *codec)
{
if (X264_BIT_DEPTH == 8)
#if X264_BUILD < 153
if (x264_bit_depth == 8)
codec->pix_fmts = pix_fmts_8bit;
else if (X264_BIT_DEPTH == 9)
else if (x264_bit_depth == 9)
codec->pix_fmts = pix_fmts_9bit;
else if (X264_BIT_DEPTH == 10)
else if (x264_bit_depth == 10)
codec->pix_fmts = pix_fmts_10bit;
else /* X264_BIT_DEPTH == 0 */
codec->pix_fmts = pix_fmts;
#else
codec->pix_fmts = pix_fmts;
#endif
}
#define OFFSET(x) offsetof(X264Context, x)