Merge commit 'b8f66c0838b4c645227f23a35b4d54373da4c60a'

[ffmpeg] / libavfilter / vf_waveform.c

diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c
index 44e9bf4dc29ec327a6ffd80ffec7c950e84575b4..0c574742a0a4dd42ec0839dc6f2a469d81e5e0f1 100644 (file)
--- a/libavfilter/vf_waveform.c
+++ b/libavfilter/vf_waveform.c
@@ -166,7 +166,7 @@ static const enum AVPixelFormat in_lowpass_pix_fmts[] = {
     AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P,
     AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P,
     AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P,
-    AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12,
+    AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12,
     AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV420P9,
     AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA420P9,
     AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV420P10,
@@ -218,12 +218,12 @@ static const enum AVPixelFormat out_rgb9_lowpass_pix_fmts[] = {
 };
 
 static const enum AVPixelFormat out_rgb10_lowpass_pix_fmts[] = {
-    AV_PIX_FMT_GBRP10,
+    AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10,
     AV_PIX_FMT_NONE
 };
 
 static const enum AVPixelFormat out_rgb12_lowpass_pix_fmts[] = {
-    AV_PIX_FMT_GBRP12,
+    AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12,
     AV_PIX_FMT_NONE
 };
 
@@ -252,6 +252,11 @@ static const enum AVPixelFormat out_gray8_lowpass_pix_fmts[] = {
     AV_PIX_FMT_NONE
 };
 
+static const enum AVPixelFormat out_gray9_lowpass_pix_fmts[] = {
+    AV_PIX_FMT_GRAY9,
+    AV_PIX_FMT_NONE
+};
+
 static const enum AVPixelFormat out_gray10_lowpass_pix_fmts[] = {
     AV_PIX_FMT_GRAY10,
     AV_PIX_FMT_NONE
@@ -311,6 +316,8 @@ static int query_formats(AVFilterContext *ctx)
 
     if (s->filter == LOWPASS && ncomp == 1 && depth == 8)
         out_pix_fmts = out_gray8_lowpass_pix_fmts;
+    else if (s->filter == LOWPASS && ncomp == 1 && depth == 9)
+        out_pix_fmts = out_gray9_lowpass_pix_fmts;
     else if (s->filter == LOWPASS && ncomp == 1 && depth == 10)
         out_pix_fmts = out_gray10_lowpass_pix_fmts;
     else if (s->filter == LOWPASS && ncomp == 1 && depth == 12)