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.) --- demux/demux_mkv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'demux/demux_mkv.c') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 97c7d3e09b..c3988b8bf8 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -56,7 +56,6 @@ #include "ebml.h" #include "matroska.h" #include "codec_tags.h" -#include "video/img_fourcc.h" #include "common/msg.h" @@ -1392,8 +1391,8 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track) fourcc1 = AV_RL32(track->private_data + 0); fourcc2 = AV_RL32(track->private_data + 4); } - if (fourcc1 == MP_FOURCC('S', 'V', 'Q', '3') || - fourcc2 == MP_FOURCC('S', 'V', 'Q', '3')) + if (fourcc1 == MKTAG('S', 'V', 'Q', '3') || + fourcc2 == MKTAG('S', 'V', 'Q', '3')) { sh_v->codec = "svq3"; extradata = track->private_data; @@ -1417,7 +1416,7 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track) track->parse = true; track->parse_timebase = 1e9; } else if (!strcmp(codec, "mjpeg")) { - sh_v->codec_tag = MP_FOURCC('m', 'j', 'p', 'g'); + sh_v->codec_tag = MKTAG('m', 'j', 'p', 'g'); } if (extradata_size > 0x1000000) { -- cgit v1.2.3