From b6d0b57e8531c2cacb237e2144e858cfdbf1eb32 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 18 Jun 2017 15:00:36 +0200 Subject: Drop/move img_fourcc.h This file is an leftover from when img_format.h was changed from using the ancient FourCCs (based on Microsoft multimedia conventions) for pixel formats to a simple enum. The remaining cases still inherently used FourCCs for whatever reasons. Instead of worrying about residual copyrights in this file, just move it into code we don't want to relicense (the ancient Linux TV code). We have to fix some other code depending on it. For the most part, we just replace the MP_FOURCC macro with libavutil's MKTAG (although the macro definition is exactly the same). In demux_raw, we drop some pre-defined FourCCs, but it's not like it matters. (Instead of --demuxer-rawvideo-format use --demuxer-rawvideo-mp-format.) --- stream/tvi_v4l2.c | 1 - 1 file changed, 1 deletion(-) (limited to 'stream/tvi_v4l2.c') diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index ae651f00e1..bd7ecd1e27 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -55,7 +55,6 @@ known issues: #endif #include "common/msg.h" #include "common/common.h" -#include "video/img_fourcc.h" #include "audio/format.h" #include "tv.h" #include "audio_in.h" -- cgit v1.2.3