[FFmpeg-cvslog] lavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is x264 's native format

[Kieran Kunhya]

ffmpeg | branch: master | Kieran Kunhya <kierank at ob-encoder.com> | Sun Sep 22 10:54:47 2013 -0500| [283fb76d3d6eef1337ed493eae25fc0fc3752ce7] | committer: Michael Niedermayer

lavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is x264's native format

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=283fb76d3d6eef1337ed493eae25fc0fc3752ce7
---

 libavcodec/libx264.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 0d8ba29..197662d 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[] = {