SliTaz Repositories

     1.1 --- a/ffmpeg-dev/stuff/avutil.h	Tue Apr 21 21:25:07 2009 +0000
     1.2 +++ b/ffmpeg-dev/stuff/avutil.h	Sun Dec 11 02:16:15 2011 +0100
     1.3 @@ -35,7 +35,7 @@
     1.4  #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
     1.5  
     1.6  #define LIBAVUTIL_VERSION_MAJOR 49
     1.7 -#define LIBAVUTIL_VERSION_MINOR 14
     1.8 +#define LIBAVUTIL_VERSION_MINOR 15
     1.9  #define LIBAVUTIL_VERSION_MICRO  0
    1.10  
    1.11  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
    1.12 @@ -58,99 +58,6 @@
    1.13  #include "rational.h"
    1.14  #include "intfloat_readwrite.h"
    1.15  #include "log.h"
    1.16 -
    1.17 -/**
    1.18 - * Pixel format. Notes:
    1.19 - *
    1.20 - * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
    1.21 - * color is put together as:
    1.22 - *  (A << 24) | (R << 16) | (G << 8) | B
    1.23 - * This is stored as BGRA on little-endian CPU architectures and ARGB on
    1.24 - * big-endian CPUs.
    1.25 - *
    1.26 - * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
    1.27 - * image data is stored in AVFrame.data[0]. The palette is transported in
    1.28 - * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
    1.29 - * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
    1.30 - * also endian-specific). Note also that the individual RGB palette
    1.31 - * components stored in AVFrame.data[1] should be in the range 0..255.
    1.32 - * This is important as many custom PAL8 video codecs that were designed
    1.33 - * to run on the IBM VGA graphics adapter use 6-bit palette components.
    1.34 - *
    1.35 - * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
    1.36 - * for pal8. This palette is filled in automatically by the function
    1.37 - * allocating the picture.
    1.38 - */
    1.39 -enum PixelFormat {
    1.40 -    PIX_FMT_NONE= -1,
    1.41 -    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
    1.42 -    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
    1.43 -    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
    1.44 -    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
    1.45 -    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
    1.46 -    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
    1.47 -    PIX_FMT_RGB32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8R 8G 8B(lsb), in CPU endianness
    1.48 -    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
    1.49 -    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
    1.50 -    PIX_FMT_RGB565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), in CPU endianness
    1.51 -    PIX_FMT_RGB555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), in CPU endianness, most significant bit to 0
    1.52 -    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
    1.53 -    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black
    1.54 -    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white
    1.55 -    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
    1.56 -    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG)
    1.57 -    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG)
    1.58 -    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG)
    1.59 -    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
    1.60 -    PIX_FMT_XVMC_MPEG2_IDCT,
    1.61 -    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
    1.62 -    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
    1.63 -    PIX_FMT_BGR32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8B 8G 8R(lsb), in CPU endianness
    1.64 -    PIX_FMT_BGR565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), in CPU endianness
    1.65 -    PIX_FMT_BGR555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), in CPU endianness, most significant bit to 1
    1.66 -    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
    1.67 -    PIX_FMT_BGR4,      ///< packed RGB 1:2:1,  4bpp, (msb)1B 2G 1R(lsb)
    1.68 -    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
    1.69 -    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
    1.70 -    PIX_FMT_RGB4,      ///< packed RGB 1:2:1,  4bpp, (msb)1R 2G 1B(lsb)
    1.71 -    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
    1.72 -    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
    1.73 -    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
    1.74 -
    1.75 -    PIX_FMT_RGB32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in CPU endianness
    1.76 -    PIX_FMT_BGR32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8B 8G 8R 8A(lsb), in CPU endianness
    1.77 -
    1.78 -    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
    1.79 -    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
    1.80 -    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
    1.81 -    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG)
    1.82 -    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
    1.83 -    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
    1.84 -    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
    1.85 -    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
    1.86 -    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
    1.87 -    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
    1.88 -    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
    1.89 -};
    1.90 -
    1.91 -#ifdef WORDS_BIGENDIAN
    1.92 -#define PIX_FMT_RGBA PIX_FMT_RGB32_1
    1.93 -#define PIX_FMT_BGRA PIX_FMT_BGR32_1
    1.94 -#define PIX_FMT_ARGB PIX_FMT_RGB32
    1.95 -#define PIX_FMT_ABGR PIX_FMT_BGR32
    1.96 -#define PIX_FMT_GRAY16 PIX_FMT_GRAY16BE
    1.97 -#else
    1.98 -#define PIX_FMT_RGBA PIX_FMT_BGR32
    1.99 -#define PIX_FMT_BGRA PIX_FMT_RGB32
   1.100 -#define PIX_FMT_ARGB PIX_FMT_BGR32_1
   1.101 -#define PIX_FMT_ABGR PIX_FMT_RGB32_1
   1.102 -#define PIX_FMT_GRAY16 PIX_FMT_GRAY16LE
   1.103 -#endif
   1.104 -
   1.105 -#if LIBAVUTIL_VERSION_INT < (50<<16)
   1.106 -#define PIX_FMT_UYVY411 PIX_FMT_UYYVYY411
   1.107 -#define PIX_FMT_RGBA32  PIX_FMT_RGB32
   1.108 -#define PIX_FMT_YUV422  PIX_FMT_YUYV422
   1.109 -#endif
   1.110 +#include "pixfmt.h"
   1.111  
   1.112  #endif /* AVUTIL_AVUTIL_H */