[FFmpeg-cvslog] r25464 - in trunk/libavcodec: targa.c targa.h targaenc.c

stefano subversion
Wed Oct 13 12:39:45 CEST 2010


Author: stefano
Date: Wed Oct 13 12:39:45 2010
New Revision: 25464

Log:
Create a targa.h file to contain common definitions for targa encoder
and decoder.

Added:
   trunk/libavcodec/targa.h
Modified:
   trunk/libavcodec/targa.c
   trunk/libavcodec/targaenc.c

Modified: trunk/libavcodec/targa.c
==============================================================================
--- trunk/libavcodec/targa.c	Wed Oct 13 11:06:59 2010	(r25463)
+++ trunk/libavcodec/targa.c	Wed Oct 13 12:39:45 2010	(r25464)
@@ -22,14 +22,7 @@
 #include "libavutil/intreadwrite.h"
 #include "libavcore/imgutils.h"
 #include "avcodec.h"
-
-enum TargaCompr{
-    TGA_NODATA = 0, // no image data
-    TGA_PAL    = 1, // palettized
-    TGA_RGB    = 2, // true-color
-    TGA_BW     = 3, // black & white or grayscale
-    TGA_RLE    = 8, // flag pointing that data is RLE-coded
-};
+#include "targa.h"
 
 typedef struct TargaContext {
     AVFrame picture;

Added: trunk/libavcodec/targa.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libavcodec/targa.h	Wed Oct 13 12:39:45 2010	(r25464)
@@ -0,0 +1,36 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * targa file common definitions
+ *
+ * Based on:
+ * http://www.gamers.org/dEngine/quake3/TGA.txt
+ *
+ * and other specs you can find referenced for example in:
+ * http://en.wikipedia.org/wiki/Truevision_TGA
+ */
+
+enum TargaCompr {
+    TGA_NODATA = 0, // no image data
+    TGA_PAL    = 1, // palettized
+    TGA_RGB    = 2, // true-color
+    TGA_BW     = 3, // black & white or grayscale
+    TGA_RLE    = 8, // flag pointing that data is RLE-coded
+};

Modified: trunk/libavcodec/targaenc.c
==============================================================================
--- trunk/libavcodec/targaenc.c	Wed Oct 13 11:06:59 2010	(r25463)
+++ trunk/libavcodec/targaenc.c	Wed Oct 13 12:39:45 2010	(r25464)
@@ -22,6 +22,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "rle.h"
+#include "targa.h"
 
 typedef struct TargaContext {
     AVFrame picture;



More information about the ffmpeg-cvslog mailing list