From 58894ab3f94d29b7497778289a21a166b6441a6a Mon Sep 17 00:00:00 2001 From: Kieran Kunhya Date: Sun, 22 Sep 2013 10:54:47 -0500 Subject: lavc: add support for interleaved chroma formats to libx264. Interleaved chroma is x264's native format Signed-off-by: Anton Khirnov --- libavcodec/libx264.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 5d0c7a1693..e967d31677 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -225,6 +225,9 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) case AV_PIX_FMT_YUV444P: case AV_PIX_FMT_YUV444P9: case AV_PIX_FMT_YUV444P10: return X264_CSP_I444; + case AV_PIX_FMT_NV12: return X264_CSP_NV12; + case AV_PIX_FMT_NV16: + case AV_PIX_FMT_NV20: return X264_CSP_NV16; }; return 0; } @@ -480,6 +483,8 @@ static const enum AVPixelFormat pix_fmts_8bit[] = { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, + AV_PIX_FMT_NV12, + AV_PIX_FMT_NV16, AV_PIX_FMT_NONE }; static const enum AVPixelFormat pix_fmts_9bit[] = { @@ -491,6 +496,7 @@ static const enum AVPixelFormat pix_fmts_10bit[] = { AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_NV20, AV_PIX_FMT_NONE }; -- cgit v1.2.3