summaryrefslogtreecommitdiffstats
path: root/Copyright
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-18 15:00:36 +0200
committerwm4 <wm4@nowhere>2017-06-18 15:13:45 +0200
commitb6d0b57e8531c2cacb237e2144e858cfdbf1eb32 (patch)
treec339318aa6acb18c841013ce639389d43ca44c66 /Copyright
parent32833fa3d14b78cd2a481641cfa174d4bee6533e (diff)
downloadmpv-b6d0b57e8531c2cacb237e2144e858cfdbf1eb32.tar.bz2
mpv-b6d0b57e8531c2cacb237e2144e858cfdbf1eb32.tar.xz
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.)
Diffstat (limited to 'Copyright')
-rw-r--r--Copyright1
1 files changed, 0 insertions, 1 deletions
diff --git a/Copyright b/Copyright
index 78078dbcc4..0078a5100f 100644
--- a/Copyright
+++ b/Copyright
@@ -306,7 +306,6 @@ x video/fmt-conversion.* hard
video/hwdec.* LGPL
x video/image_writer.* unknown
x video/img_format.* hard
-x video/img_fourcc.h hard
video/mp_image.* almost LGPL
video/mp_image_pool.* LGPL
video/out/aspect.* LGPL