]> git.sesse.net Git - ffmpeg/commitdiff
lavc: add support for interleaved chroma formats to libx264.
authorKieran Kunhya <kierank@ob-encoder.com>
Sun, 22 Sep 2013 15:54:47 +0000 (10:54 -0500)
committerAnton Khirnov <anton@khirnov.net>
Tue, 24 Sep 2013 12:15:04 +0000 (14:15 +0200)
Interleaved chroma is x264's native format

Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/libx264.c

index 5d0c7a1693c1d4b0eda4f70893d00c25ec21909b..e967d31677505173d5d1bf3ccbc4d24a2328f036 100644 (file)
@@ -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
 };