aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Xiaolei <dreifachstein@gmail.com>2015-08-01 06:42:15 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2015-08-01 02:14:18 +0200
commit2ef6994ef6354425e0b1c229b05a0b2ffe0928e9 (patch)
tree39110eb57c7747022f9356f5c81fd7c39372c671
parent293e25be615d43c9b611c4b04920ec0d245a7145 (diff)
downloadffmpeg-2ef6994ef6354425e0b1c229b05a0b2ffe0928e9.tar.gz
avcodec/libx264: expose nv21 input support
libx264 added support for NV21 input recently. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/libx264.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 5da816ef06..c017685bb9 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -381,6 +381,9 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt)
case AV_PIX_FMT_NV12: return X264_CSP_NV12;
case AV_PIX_FMT_NV16:
case AV_PIX_FMT_NV20: return X264_CSP_NV16;
+#ifdef X264_CSP_NV21
+ case AV_PIX_FMT_NV21: return X264_CSP_NV21;
+#endif
};
return 0;
}
@@ -770,6 +773,9 @@ static const enum AVPixelFormat pix_fmts_8bit[] = {
AV_PIX_FMT_YUVJ444P,
AV_PIX_FMT_NV12,
AV_PIX_FMT_NV16,
+#ifdef X264_CSP_NV21
+ AV_PIX_FMT_NV21,
+#endif
AV_PIX_FMT_NONE
};
static const enum AVPixelFormat pix_fmts_9bit[] = {