summaryrefslogtreecommitdiff
path: root/libavcodec/libx264.c
diff options
context:
space:
mode:
authorKieran Kunhya <kierank@ob-encoder.com>2013-09-22 10:54:47 -0500
committerAnton Khirnov <anton@khirnov.net>2013-09-24 14:15:04 +0200
commit58894ab3f94d29b7497778289a21a166b6441a6a (patch)
tree18300738d8056e38d74a3376aa688cbbb72ba86e /libavcodec/libx264.c
parenta454dec19aa6666b555deec431bc42eda391d7b6 (diff)
lavc: add support for interleaved chroma formats to libx264.
Interleaved chroma is x264's native format Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/libx264.c')
-rw-r--r--libavcodec/libx264.c6
1 files changed, 6 insertions, 0 deletions
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
};