diff options
| author | Kieran Kunhya <kierank@ob-encoder.com> | 2013-09-22 10:54:47 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 19:55:57 +0200 |
| commit | 283fb76d3d6eef1337ed493eae25fc0fc3752ce7 (patch) | |
| tree | 7f4d927353ad4d0109a0610f0f7784cf33ad38ff /libavcodec/libx264.c | |
| parent | b00fb157bae79f9735910064585fd95b8c123003 (diff) | |
| download | ffmpeg-283fb76d3d6eef1337ed493eae25fc0fc3752ce7.tar.gz | |
lavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is x264's native format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 0d8ba2959d..197662d83e 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -275,6 +275,9 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) case AV_PIX_FMT_RGB24: return X264_CSP_RGB; #endif + 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; } @@ -602,6 +605,8 @@ static const enum AVPixelFormat pix_fmts_8bit[] = { AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, + AV_PIX_FMT_NV12, + AV_PIX_FMT_NV16, AV_PIX_FMT_NONE }; static const enum AVPixelFormat pix_fmts_9bit[] = { @@ -613,6 +618,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 }; static const enum AVPixelFormat pix_fmts_8bit_rgb[] = { |