http: add 'timeout' AVOption

[ffmpeg] / libavfilter / vf_colormatrix.c

diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c
index 1605286a45df3bd3877a95c047fe55098b33f729..f3312044822fb9b096aca12757c1ecb9d376d77a 100644 (file)
--- a/libavfilter/vf_colormatrix.c
+++ b/libavfilter/vf_colormatrix.c
@@ -28,7 +28,6 @@
  * adds an option to use scaled or non-scaled coefficients, and more...
  */
 
-#include <strings.h>
 #include <float.h>
 #include "avfilter.h"
 #include "formats.h"
@@ -321,11 +320,11 @@ static int config_input(AVFilterLink *inlink)
 
 static int query_formats(AVFilterContext *ctx)
 {
-    static const enum PixelFormat pix_fmts[] = {
-        PIX_FMT_YUV422P,
-        PIX_FMT_YUV420P,
-        PIX_FMT_UYVY422,
-        PIX_FMT_NONE
+    static const enum AVPixelFormat pix_fmts[] = {
+        AV_PIX_FMT_YUV422P,
+        AV_PIX_FMT_YUV420P,
+        AV_PIX_FMT_UYVY422,
+        AV_PIX_FMT_NONE
     };
 
     ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
@@ -357,9 +356,9 @@ static int end_frame(AVFilterLink *link)
     ColorMatrixContext *color = ctx->priv;
     AVFilterBufferRef *out = color->outpicref;
 
-    if (link->cur_buf->format == PIX_FMT_YUV422P)
+    if (link->cur_buf->format == AV_PIX_FMT_YUV422P)
         process_frame_yuv422p(color, out, link->cur_buf);
-    else if (link->cur_buf->format == PIX_FMT_YUV420P)
+    else if (link->cur_buf->format == AV_PIX_FMT_YUV420P)
         process_frame_yuv420p(color, out, link->cur_buf);
     else
         process_frame_uyvy422(color, out, link->cur_buf);