Hi,
I would recommend using "move" instead of "shift".
On 02/16/2012 02:48 PM, Aneesh Dogra wrote:
> ---
> libavcodec/sunrast.c | 27 +-----------------------
> libavcodec/sunrast.h | 56
> ++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 57 insertions(+), 26 deletions(-)
> create mode 100644 libavcodec/sunrast.h
>
> diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
> index d01a1ef..8754fc5 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 0000000..d9fe307
> --- /dev/null
> +++ b/libavcodec/sunrast.h
> @@ -0,0 +1,56 @@
> +/*
> + * 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
> +
> +#define RMT_NONE 0
> +#define RMT_EQUAL_RGB 1
> +#define RMT_RAW 2 ///< the data layout of this map type is unknown
These aren't in the original code.
> +/* 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
> +#define RLE_TRIGGER 0x80
same for RLE_TRIGGER.
-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
