Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-02-11 06:57:02 +0300
committerCampbell Barton <campbell@blender.org>2022-02-11 07:15:49 +0300
commitfe55789b6f5921b80242e51f79397d17ee2f3470 (patch)
treee973eb171a60ae6556adf61a7f7ce0cffecee71b /intern/ffmpeg
parent281ba8a063250b3cf7051b3f52846a8e0b960aee (diff)
File headers: manually convert files to use SPDX headers
Also add BSD-2-Clause to SPDX license list.
Diffstat (limited to 'intern/ffmpeg')
-rw-r--r--intern/ffmpeg/ffmpeg_compat.h23
-rw-r--r--intern/ffmpeg/tests/ffmpeg_codecs.cc2
2 files changed, 10 insertions, 15 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index 17e2a7dc05b..f311e04d8e0 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
@@ -1,20 +1,13 @@
-/*
- * compatibility macros to make every ffmpeg installation appear
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2011 Peter Schlaile. */
+
+/** \file
+ * \ingroup ffmpeg
+ *
+ * Compatibility macros to make every FFMPEG installation appear
* like the most current installation (wrapping some functionality sometimes)
- * it also includes all ffmpeg header files at once, no need to do it
+ * it also includes all FFMPEG header files at once, no need to do it
* separately.
- *
- * Copyright (c) 2011 Peter Schlaile
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*/
#ifndef __FFMPEG_COMPAT_H__
diff --git a/intern/ffmpeg/tests/ffmpeg_codecs.cc b/intern/ffmpeg/tests/ffmpeg_codecs.cc
index 9538bac84d2..bb6e13579e5 100644
--- a/intern/ffmpeg/tests/ffmpeg_codecs.cc
+++ b/intern/ffmpeg/tests/ffmpeg_codecs.cc
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "testing/testing.h"
extern "C" {