From 1f1fbcfa71d1d3f90f90a72ba3fb32ddbb545df2 Mon Sep 17 00:00:00 2001 From: Aneesh Dogra Date: Fri, 17 Feb 2012 01:47:34 +0530 Subject: sunrast: Move common defines to a new header file. Signed-off-by: Justin Ruggles --- libavcodec/sunrast.c | 27 +-------------------------- libavcodec/sunrast.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 26 deletions(-) create mode 100644 libavcodec/sunrast.h diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index d01a1ef381..8754fc5925 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -22,32 +22,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "avcodec.h" - -#define RAS_MAGIC 0x59a66a95 - -/* The Old and Standard format types indicate that the image data is - * uncompressed. There is no difference between the two formats. */ -#define RT_OLD 0 -#define RT_STANDARD 1 - -/* The Byte-Encoded format type indicates that the image data is compressed - * using a run-length encoding scheme. */ -#define RT_BYTE_ENCODED 2 - -/* The RGB format type indicates that the image is uncompressed with reverse - * component order from Old and Standard (RGB vs BGR). */ -#define RT_FORMAT_RGB 3 - -/* The TIFF and IFF format types indicate that the raster file was originally - * converted from either of these file formats. We do not have any samples or - * documentation of the format details. */ -#define RT_FORMAT_TIFF 4 -#define RT_FORMAT_IFF 5 - -/* The Experimental format type is implementation-specific and is generally an - * indication that the image file does not conform to the Sun Raster file - * format specification. */ -#define RT_EXPERIMENTAL 0xffff +#include "sunrast.h" typedef struct SUNRASTContext { AVFrame picture; diff --git a/libavcodec/sunrast.h b/libavcodec/sunrast.h new file mode 100644 index 0000000000..111e4942f8 --- /dev/null +++ b/libavcodec/sunrast.h @@ -0,0 +1,51 @@ +/* + * Sun Rasterfile Image Format + * Copyright (c) 2007, 2008 Ivo van Poorten + * + * This file is part of Libav. + * + * Libav 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. + * + * Libav 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_SUNRAST_H +#define AVCODEC_SUNRAST_H + +#define RAS_MAGIC 0x59a66a95 + +/* The Old and Standard format types indicate that the image data is + * uncompressed. There is no difference between the two formats. */ +#define RT_OLD 0 +#define RT_STANDARD 1 + +/* The Byte-Encoded format type indicates that the image data is compressed + * using a run-length encoding scheme. */ +#define RT_BYTE_ENCODED 2 + +/* The RGB format type indicates that the image is uncompressed with reverse + * component order from Old and Standard (RGB vs BGR). */ +#define RT_FORMAT_RGB 3 + +/* The TIFF and IFF format types indicate that the raster file was originally + * converted from either of these file formats. We do not have any samples or + * documentation of the format details. */ +#define RT_FORMAT_TIFF 4 +#define RT_FORMAT_IFF 5 + +/* The Experimental format type is implementation-specific and is generally an + * indication that the image file does not conform to the Sun Raster file + * format specification. */ +#define RT_EXPERIMENTAL 0xffff + +#endif /* AVCODEC_SUNRAST_H */ -- cgit v1.2.3