Move video_frame.h to libretro-common

gfx/drivers/gl.c

@@ -38,6 +38,7 @@
 #include <libretro.h>
 
 #include <gfx/gl_capabilities.h>
+#include <gfx/video_frame.h>
 
 #include "gl_renderchains/render_chain_gl.h"
 
@@ -56,7 +57,6 @@
 
 #include "../font_driver.h"
 #include "../video_context_driver.h"
-#include "../video_frame.h"
 
 #ifdef HAVE_GLSL
 #include "../drivers_shader/shader_glsl.h"

gfx/drivers/gl_renderchains/render_chain_gl_legacy.c

@@ -38,6 +38,7 @@
 #include <libretro.h>
 
 #include <gfx/gl_capabilities.h>
+#include <gfx/video_frame.h>
 
 #include "../../../driver.h"
 #include "../../../configuration.h"
@@ -56,7 +57,6 @@
 
 #include "../../font_driver.h"
 #include "../../video_context_driver.h"
-#include "../../video_frame.h"
 
 #ifdef HAVE_GLSL
 #include "../../drivers_shader/shader_glsl.h"

gfx/drivers/omap_gfx.c

@@ -35,6 +35,7 @@
 #include <retro_inline.h>
 #include <retro_assert.h>
 #include <gfx/scaler/scaler.h>
+#include <gfx/video_frame.h>
 #include <string/stdstring.h>
 
 #include "../../configuration.h"
@@ -43,7 +44,6 @@
 #include "../../runloop.h"
 
 #include "../video_context_driver.h"
-#include "../video_frame.h"
 
 #include "../font_driver.h"
 

gfx/drivers/sdl_gfx.c

@@ -19,6 +19,7 @@
 
 #include <retro_assert.h>
 #include <gfx/scaler/scaler.h>
+#include <gfx/video_frame.h>
 #include <retro_assert.h>
 #include "../../verbosity.h"
 
@@ -37,7 +38,6 @@
 #include "../../runloop.h"
 #include "../../performance_counters.h"
 
-#include "../video_frame.h"
 #include "../video_context_driver.h"
 #include "../font_driver.h"
 

gfx/video_driver.c

@@ -26,6 +26,7 @@
 #include <retro_assert.h>
 #include <gfx/scaler/pixconv.h>
 #include <gfx/scaler/scaler.h>
+#include <gfx/video_frame.h>
 #include <formats/image.h>
 
 #ifdef HAVE_CONFIG_H
@@ -40,7 +41,6 @@
 #include "../menu/menu_setting.h"
 #endif
 
-#include "video_frame.h"
 #include "video_thread_wrapper.h"
 #include "video_context_driver.h"
 

libretro-common/include/gfx/video_frame.h

@@ -1,20 +1,27 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
- *  RetroArch 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 Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (video_frame.h).
+ * ---------------------------------------------------------------------------------------
  *
- *  RetroArch 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.
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _VIDEO_FRAME_H
-#define _VIDEO_FRAME_H
+#ifndef _LIBRETRO_SDK_VIDEO_FRAME_H
+#define _LIBRETRO_SDK_VIDEO_FRAME_H
 
 #include <stdint.h>
 #include <retro_common_api.h>

record/drivers/record_ffmpeg.c

@@ -28,6 +28,7 @@
 #include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 #include <gfx/scaler/scaler.h>
+#include <gfx/video_frame.h>
 #include <file/config_file.h>
 #include <conversion/float_to_s16.h>
 #include <conversion/s16_to_float.h>
@@ -63,7 +64,6 @@ extern "C" {
 }
 #endif
 
-
 #include "../record_driver.h"
 
 #include "../../configuration.h"
@@ -71,7 +71,6 @@ extern "C" {
 #include "../../audio/audio_resampler_driver.h"
 #include "../../verbosity.h"
 
-#include "../../gfx/video_frame.h"
 
 #ifndef PIX_FMT_RGB32
 #define PIX_FMT_RGB32 AV_PIX_FMT_RGB32

tasks/task_screenshot.c

@@ -35,6 +35,7 @@
 #include <compat/strl.h>
 #include <string/stdstring.h>
 #include <gfx/scaler/scaler.h>
+#include <gfx/video_frame.h>
 
 #ifdef HAVE_RBMP
 #include <formats/rbmp.h>
@@ -54,7 +55,6 @@
 #include "../msg_hash.h"
 
 #include "../gfx/video_driver.h"
-#include "../gfx/video_frame.h"
 
 #include "tasks_internal.h"