[FFmpeg-devel] [PATCH 2/3] Create a targa.h file to contain common definitions for targa encoder and decoder.

Stefano Sabatini stefano.sabatini-lala
Wed Oct 13 01:24:18 CEST 2010


---
 libavcodec/targa.c    |    9 +--------
 libavcodec/targa.h    |   36 ++++++++++++++++++++++++++++++++++++
 libavcodec/targaenc.c |    1 +
 3 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 libavcodec/targa.h

diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 7b905a2..7f8774e 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -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;
diff --git a/libavcodec/targa.h b/libavcodec/targa.h
new file mode 100644
index 0000000..b2682f1
--- /dev/null
+++ b/libavcodec/targa.h
@@ -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 e.g. 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
+};
diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c
index 46aaef3..d336e00 100644
--- a/libavcodec/targaenc.c
+++ b/libavcodec/targaenc.c
@@ -22,6 +22,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "rle.h"
+#include "targa.h"
 
 typedef struct TargaContext {
     AVFrame picture;
-- 
1.7.1




More information about the ffmpeg-devel mailing list