wok-current rev 5347

Updated ffmpeg, ffmpeg-dev, and ffplay to 0.5.1. Added new avutil.h for the new ffmpeg-dev.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Apr 28 10:41:34 2010 +0000 (2010-04-28)
parents cb56d4ced18c
children 4fa548ee5917
files ffmpeg-dev/receipt ffmpeg-dev/stuff/avutil.h ffmpeg/receipt ffplay/receipt
line diff
     1.1 --- a/ffmpeg-dev/receipt	Wed Apr 28 09:55:24 2010 +0000
     1.2 +++ b/ffmpeg-dev/receipt	Wed Apr 28 10:41:34 2010 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="ffmpeg-dev"
     1.7 -VERSION="0.5"
     1.8 +VERSION="0.5.1"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Record, convert and stream audio and video, development files."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
     2.1 --- a/ffmpeg-dev/stuff/avutil.h	Wed Apr 28 09:55:24 2010 +0000
     2.2 +++ b/ffmpeg-dev/stuff/avutil.h	Wed Apr 28 10:41:34 2010 +0000
     2.3 @@ -35,7 +35,7 @@
     2.4  #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
     2.5  
     2.6  #define LIBAVUTIL_VERSION_MAJOR 49
     2.7 -#define LIBAVUTIL_VERSION_MINOR 14
     2.8 +#define LIBAVUTIL_VERSION_MINOR 15
     2.9  #define LIBAVUTIL_VERSION_MICRO  0
    2.10  
    2.11  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
    2.12 @@ -58,99 +58,6 @@
    2.13  #include "rational.h"
    2.14  #include "intfloat_readwrite.h"
    2.15  #include "log.h"
    2.16 -
    2.17 -/**
    2.18 - * Pixel format. Notes:
    2.19 - *
    2.20 - * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
    2.21 - * color is put together as:
    2.22 - *  (A << 24) | (R << 16) | (G << 8) | B
    2.23 - * This is stored as BGRA on little-endian CPU architectures and ARGB on
    2.24 - * big-endian CPUs.
    2.25 - *
    2.26 - * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
    2.27 - * image data is stored in AVFrame.data[0]. The palette is transported in
    2.28 - * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
    2.29 - * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
    2.30 - * also endian-specific). Note also that the individual RGB palette
    2.31 - * components stored in AVFrame.data[1] should be in the range 0..255.
    2.32 - * This is important as many custom PAL8 video codecs that were designed
    2.33 - * to run on the IBM VGA graphics adapter use 6-bit palette components.
    2.34 - *
    2.35 - * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
    2.36 - * for pal8. This palette is filled in automatically by the function
    2.37 - * allocating the picture.
    2.38 - */
    2.39 -enum PixelFormat {
    2.40 -    PIX_FMT_NONE= -1,
    2.41 -    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
    2.42 -    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
    2.43 -    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
    2.44 -    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
    2.45 -    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
    2.46 -    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
    2.47 -    PIX_FMT_RGB32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8R 8G 8B(lsb), in CPU endianness
    2.48 -    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
    2.49 -    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
    2.50 -    PIX_FMT_RGB565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), in CPU endianness
    2.51 -    PIX_FMT_RGB555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), in CPU endianness, most significant bit to 0
    2.52 -    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
    2.53 -    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black
    2.54 -    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white
    2.55 -    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
    2.56 -    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG)
    2.57 -    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG)
    2.58 -    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG)
    2.59 -    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
    2.60 -    PIX_FMT_XVMC_MPEG2_IDCT,
    2.61 -    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
    2.62 -    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
    2.63 -    PIX_FMT_BGR32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8B 8G 8R(lsb), in CPU endianness
    2.64 -    PIX_FMT_BGR565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), in CPU endianness
    2.65 -    PIX_FMT_BGR555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), in CPU endianness, most significant bit to 1
    2.66 -    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
    2.67 -    PIX_FMT_BGR4,      ///< packed RGB 1:2:1,  4bpp, (msb)1B 2G 1R(lsb)
    2.68 -    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
    2.69 -    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
    2.70 -    PIX_FMT_RGB4,      ///< packed RGB 1:2:1,  4bpp, (msb)1R 2G 1B(lsb)
    2.71 -    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
    2.72 -    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
    2.73 -    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
    2.74 -
    2.75 -    PIX_FMT_RGB32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in CPU endianness
    2.76 -    PIX_FMT_BGR32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8B 8G 8R 8A(lsb), in CPU endianness
    2.77 -
    2.78 -    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
    2.79 -    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
    2.80 -    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
    2.81 -    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG)
    2.82 -    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
    2.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
    2.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
    2.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
    2.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
    2.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
    2.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
    2.89 -};
    2.90 -
    2.91 -#ifdef WORDS_BIGENDIAN
    2.92 -#define PIX_FMT_RGBA PIX_FMT_RGB32_1
    2.93 -#define PIX_FMT_BGRA PIX_FMT_BGR32_1
    2.94 -#define PIX_FMT_ARGB PIX_FMT_RGB32
    2.95 -#define PIX_FMT_ABGR PIX_FMT_BGR32
    2.96 -#define PIX_FMT_GRAY16 PIX_FMT_GRAY16BE
    2.97 -#else
    2.98 -#define PIX_FMT_RGBA PIX_FMT_BGR32
    2.99 -#define PIX_FMT_BGRA PIX_FMT_RGB32
   2.100 -#define PIX_FMT_ARGB PIX_FMT_BGR32_1
   2.101 -#define PIX_FMT_ABGR PIX_FMT_RGB32_1
   2.102 -#define PIX_FMT_GRAY16 PIX_FMT_GRAY16LE
   2.103 -#endif
   2.104 -
   2.105 -#if LIBAVUTIL_VERSION_INT < (50<<16)
   2.106 -#define PIX_FMT_UYVY411 PIX_FMT_UYYVYY411
   2.107 -#define PIX_FMT_RGBA32  PIX_FMT_RGB32
   2.108 -#define PIX_FMT_YUV422  PIX_FMT_YUYV422
   2.109 -#endif
   2.110 +#include "pixfmt.h"
   2.111  
   2.112  #endif /* AVUTIL_AVUTIL_H */
     3.1 --- a/ffmpeg/receipt	Wed Apr 28 09:55:24 2010 +0000
     3.2 +++ b/ffmpeg/receipt	Wed Apr 28 10:41:34 2010 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="ffmpeg"
     3.7 -VERSION="0.5"
     3.8 +VERSION="0.5.1"
     3.9  CATEGORY="multimedia"
    3.10  SHORT_DESC="Record, convert and stream audio and video."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
     4.1 --- a/ffplay/receipt	Wed Apr 28 09:55:24 2010 +0000
     4.2 +++ b/ffplay/receipt	Wed Apr 28 10:41:34 2010 +0000
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="ffplay"
     4.7 -VERSION="0.5"
     4.8 +VERSION="0.5.1"
     4.9  CATEGORY="multimedia"
    4.10  SHORT_DESC="Very simple and portable media player using the ffmpeg and the SDL library."
    4.11  MAINTAINER="pascal.bellard@slitaz.org"