From b5becbab090c0a5be1c2df47ecd116cf2c1d7823 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Wed, 13 Oct 2010 10:39:45 +0000 Subject: [PATCH] Create a targa.h file to contain common definitions for targa encoder and decoder. Originally committed as revision 25464 to svn://svn.ffmpeg.org/ffmpeg/trunk --- 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 7b905a2d98..7f8774ef54 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 0000000000..5bc2a4407c --- /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 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 +}; diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index 1db0ea2155..1d50326573 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;