@@ -18,6 +18,7 @@ version <next>:

 - showpalette filter

 - Twofish symmetric block cipher

 - Support DNx100 (960x720@8)

+- removed libmpcodecs

 version 2.5:

@@ -13,7 +13,6 @@ configure to activate them. In this case, FFmpeg's license changes to GPL v2+.

 Specifically, the GPL parts of FFmpeg are:

 - libpostproc

-- libmpcodecs

 - optional x86 optimizations in the files

   libavcodec/x86/flac_dsp_gpl.asm

   libavcodec/x86/idct_mmx.c

@@ -38,7 +37,6 @@ Specifically, the GPL parts of FFmpeg are:

     - vf_interlace.c

     - vf_kerndeint.c

     - vf_mcdeint.c

-    - vf_mp.c

     - vf_mpdecimate.c

     - vf_owdenoise.c

     - vf_perspective.c

@@ -2597,7 +2597,6 @@ kerndeint_filter_deps="gpl"

 ladspa_filter_deps="ladspa dlopen"

 mcdeint_filter_deps="avcodec gpl"

 movie_filter_deps="avcodec avformat"

-mp_filter_deps="gpl avcodec swscale"

 mpdecimate_filter_deps="gpl"

 mpdecimate_filter_select="pixelutils"

 mptestsrc_filter_deps="gpl"

@@ -6263,35 +6263,6 @@ Higher values should result in a smoother motion vector field but less

 optimal individual vectors. Default value is 1.

 @end table

-@section mp

-

-Apply an MPlayer filter to the input video.

-

-This filter provides a wrapper around some of the filters of

-MPlayer/MEncoder.

-

-This wrapper is considered experimental. Some of the wrapped filters

-may not work properly and we may drop support for them, as they will

-be implemented natively into FFmpeg. Thus you should avoid

-depending on them when writing portable scripts.

-

-The filter accepts the parameters:

-@var{filter_name}[:=]@var{filter_params}

-

-@var{filter_name} is the name of a supported MPlayer filter,

-@var{filter_params} is a string containing the parameters accepted by

-the named filter.

-

-The list of the currently supported filters follows:

-@table @var

-@end table

-

-The parameter syntax and behavior for the listed filters are the same

-of the corresponding MPlayer filters. For detailed instructions check

-the "VIDEO FILTERS" section in the MPlayer manual.

-

-See also mplayer(1), @url{http://www.mplayerhq.hu/}.

-

 @section mpdecimate

 Drop frames that do not differ greatly from the previous frame in

@@ -149,7 +149,6 @@ OBJS-$(CONFIG_LUTRGB_FILTER)                 += vf_lut.o

 OBJS-$(CONFIG_LUTYUV_FILTER)                 += vf_lut.o

 OBJS-$(CONFIG_MCDEINT_FILTER)                += vf_mcdeint.o

 OBJS-$(CONFIG_MERGEPLANES_FILTER)            += vf_mergeplanes.o framesync.o

-OBJS-$(CONFIG_MP_FILTER)                     += vf_mp.o

 OBJS-$(CONFIG_MPDECIMATE_FILTER)             += vf_mpdecimate.o

 OBJS-$(CONFIG_NEGATE_FILTER)                 += vf_lut.o

 OBJS-$(CONFIG_NOFORMAT_FILTER)               += vf_format.o

@@ -226,9 +225,6 @@ OBJS-$(CONFIG_TESTSRC_FILTER)                += vsrc_testsrc.o

 OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o

-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/mp_image.o

-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/img_format.o

-

 # multimedia filters

 OBJS-$(CONFIG_AVECTORSCOPE_FILTER)           += avf_avectorscope.o

 OBJS-$(CONFIG_CONCAT_FILTER)                 += avf_concat.o

@@ -165,7 +165,6 @@ void avfilter_register_all(void)

     REGISTER_FILTER(LUTYUV,         lutyuv,         vf);

     REGISTER_FILTER(MCDEINT,        mcdeint,        vf);

     REGISTER_FILTER(MERGEPLANES,    mergeplanes,    vf);

-    REGISTER_FILTER(MP,             mp,             vf);

     REGISTER_FILTER(MPDECIMATE,     mpdecimate,     vf);

     REGISTER_FILTER(NEGATE,         negate,         vf);

     REGISTER_FILTER(NOFORMAT,       noformat,       vf);

deleted file mode 100644

@@ -1,60 +0,0 @@

-/*

- * This file is part of MPlayer.

- *

- * MPlayer is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * MPlayer 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 General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License along

- * with MPlayer; if not, write to the Free Software Foundation, Inc.,

- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

- */

-

-#ifndef MPLAYER_CPUDETECT_H

-#define MPLAYER_CPUDETECT_H

-

-#define CPUTYPE_I386    3

-#define CPUTYPE_I486    4

-#define CPUTYPE_I586    5

-#define CPUTYPE_I686    6

-

-#include "libavutil/x86_cpu.h"

-

-typedef struct cpucaps_s {

-    int cpuType;

-    int cpuModel;

-    int cpuStepping;

-    int hasMMX;

-    int hasMMX2;

-    int has3DNow;

-    int has3DNowExt;

-    int hasSSE;

-    int hasSSE2;

-    int hasSSE3;

-    int hasSSSE3;

-    int hasSSE4;

-    int hasSSE42;

-    int hasSSE4a;

-    int hasAVX;

-    int isX86;

-    unsigned cl_size; /* size of cache line */

-    int hasAltiVec;

-    int hasTSC;

-} CpuCaps;

-

-extern CpuCaps ff_gCpuCaps;

-

-void ff_do_cpuid(unsigned int ax, unsigned int *p);

-

-void ff_GetCpuCaps(CpuCaps *caps);

-

-/* returned value is malloc()'ed so free() it after use */

-char *ff_GetCpuFriendlyName(unsigned int regs[], unsigned int regs2[]);

-

-#endif /* MPLAYER_CPUDETECT_H */

deleted file mode 100644

@@ -1,244 +0,0 @@

-/*

- * This file is part of MPlayer.

- *

- * MPlayer is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * MPlayer 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 General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License along

- * with MPlayer; if not, write to the Free Software Foundation, Inc.,

- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

- */

-

-#include "config.h"

-#include "img_format.h"

-#include "stdio.h"

-#include "libavutil/bswap.h"

-

-const char *ff_vo_format_name(int format)

-{

-    static char unknown_format[20];

-    switch(format)

-    {

-    case IMGFMT_RGB1:    return "RGB 1-bit";

-    case IMGFMT_RGB4:    return "RGB 4-bit";

-    case IMGFMT_RG4B:    return "RGB 4-bit per byte";

-    case IMGFMT_RGB8:    return "RGB 8-bit";

-    case IMGFMT_RGB12:   return "RGB 12-bit";

-    case IMGFMT_RGB15:   return "RGB 15-bit";

-    case IMGFMT_RGB16:   return "RGB 16-bit";

-    case IMGFMT_RGB24:   return "RGB 24-bit";

-//  case IMGFMT_RGB32:   return "RGB 32-bit";

-    case IMGFMT_RGB48LE: return "RGB 48-bit LE";

-    case IMGFMT_RGB48BE: return "RGB 48-bit BE";

-    case IMGFMT_RGB64LE: return "RGB 64-bit LE";

-    case IMGFMT_RGB64BE: return "RGB 64-bit BE";

-    case IMGFMT_BGR1:    return "BGR 1-bit";

-    case IMGFMT_BGR4:    return "BGR 4-bit";

-    case IMGFMT_BG4B:    return "BGR 4-bit per byte";

-    case IMGFMT_BGR8:    return "BGR 8-bit";

-    case IMGFMT_BGR12:   return "BGR 12-bit";

-    case IMGFMT_BGR15:   return "BGR 15-bit";

-    case IMGFMT_BGR16:   return "BGR 16-bit";

-    case IMGFMT_BGR24:   return "BGR 24-bit";

-//  case IMGFMT_BGR32:   return "BGR 32-bit";

-    case IMGFMT_ABGR:    return "ABGR";

-    case IMGFMT_BGRA:    return "BGRA";

-    case IMGFMT_ARGB:    return "ARGB";

-    case IMGFMT_RGBA:    return "RGBA";

-    case IMGFMT_XYZ12LE: return "XYZ 36-bit LE";

-    case IMGFMT_XYZ12BE: return "XYZ 36-bit BE";

-    case IMGFMT_GBR24P:  return "Planar GBR 24-bit";

-    case IMGFMT_GBR12P:  return "Planar GBR 36-bit";

-    case IMGFMT_GBR14P:  return "Planar GBR 42-bit";

-    case IMGFMT_YVU9:    return "Planar YVU9";

-    case IMGFMT_IF09:    return "Planar IF09";

-    case IMGFMT_YV12:    return "Planar YV12";

-    case IMGFMT_I420:    return "Planar I420";

-    case IMGFMT_IYUV:    return "Planar IYUV";

-    case IMGFMT_CLPL:    return "Planar CLPL";

-    case IMGFMT_Y800:    return "Planar Y800";

-    case IMGFMT_Y8:      return "Planar Y8";

-    case IMGFMT_Y8A:     return "Planar Y8 with alpha";

-    case IMGFMT_Y16_LE:  return "Planar Y16 little-endian";

-    case IMGFMT_Y16_BE:  return "Planar Y16 big-endian";

-    case IMGFMT_420P16_LE: return "Planar 420P 16-bit little-endian";

-    case IMGFMT_420P16_BE: return "Planar 420P 16-bit big-endian";

-    case IMGFMT_420P14_LE: return "Planar 420P 14-bit little-endian";

-    case IMGFMT_420P14_BE: return "Planar 420P 14-bit big-endian";

-    case IMGFMT_420P12_LE: return "Planar 420P 12-bit little-endian";

-    case IMGFMT_420P12_BE: return "Planar 420P 12-bit big-endian";

-    case IMGFMT_420P10_LE: return "Planar 420P 10-bit little-endian";

-    case IMGFMT_420P10_BE: return "Planar 420P 10-bit big-endian";

-    case IMGFMT_420P9_LE:  return "Planar 420P 9-bit little-endian";

-    case IMGFMT_420P9_BE:  return "Planar 420P 9-bit big-endian";

-    case IMGFMT_422P16_LE: return "Planar 422P 16-bit little-endian";

-    case IMGFMT_422P16_BE: return "Planar 422P 16-bit big-endian";

-    case IMGFMT_422P14_LE: return "Planar 422P 14-bit little-endian";

-    case IMGFMT_422P14_BE: return "Planar 422P 14-bit big-endian";

-    case IMGFMT_422P12_LE: return "Planar 422P 12-bit little-endian";

-    case IMGFMT_422P12_BE: return "Planar 422P 12-bit big-endian";

-    case IMGFMT_422P10_LE: return "Planar 422P 10-bit little-endian";

-    case IMGFMT_422P10_BE: return "Planar 422P 10-bit big-endian";

-    case IMGFMT_422P9_LE:  return "Planar 422P 9-bit little-endian";

-    case IMGFMT_422P9_BE:  return "Planar 422P 9-bit big-endian";

-    case IMGFMT_444P16_LE: return "Planar 444P 16-bit little-endian";

-    case IMGFMT_444P16_BE: return "Planar 444P 16-bit big-endian";

-    case IMGFMT_444P14_LE: return "Planar 444P 14-bit little-endian";

-    case IMGFMT_444P14_BE: return "Planar 444P 14-bit big-endian";

-    case IMGFMT_444P12_LE: return "Planar 444P 12-bit little-endian";

-    case IMGFMT_444P12_BE: return "Planar 444P 12-bit big-endian";

-    case IMGFMT_444P10_LE: return "Planar 444P 10-bit little-endian";

-    case IMGFMT_444P10_BE: return "Planar 444P 10-bit big-endian";

-    case IMGFMT_444P9_LE:  return "Planar 444P 9-bit little-endian";

-    case IMGFMT_444P9_BE:  return "Planar 444P 9-bit big-endian";

-    case IMGFMT_420A: return "Planar 420P with alpha";

-    case IMGFMT_444P: return "Planar 444P";

-    case IMGFMT_444A: return "Planar 444P with alpha";

-    case IMGFMT_422P: return "Planar 422P";

-    case IMGFMT_422A: return "Planar 422P with alpha";

-    case IMGFMT_411P: return "Planar 411P";

-    case IMGFMT_440P: return "Planar 440P";

-    case IMGFMT_NV12: return "Planar NV12";

-    case IMGFMT_NV21: return "Planar NV21";

-    case IMGFMT_HM12: return "Planar NV12 Macroblock";

-    case IMGFMT_IUYV: return "Packed IUYV";

-    case IMGFMT_IY41: return "Packed IY41";

-    case IMGFMT_IYU1: return "Packed IYU1";

-    case IMGFMT_IYU2: return "Packed IYU2";

-    case IMGFMT_UYVY: return "Packed UYVY";

-    case IMGFMT_UYNV: return "Packed UYNV";

-    case IMGFMT_cyuv: return "Packed CYUV";

-    case IMGFMT_Y422: return "Packed Y422";

-    case IMGFMT_YUY2: return "Packed YUY2";

-    case IMGFMT_YUNV: return "Packed YUNV";

-    case IMGFMT_YVYU: return "Packed YVYU";

-    case IMGFMT_Y41P: return "Packed Y41P";

-    case IMGFMT_Y211: return "Packed Y211";

-    case IMGFMT_Y41T: return "Packed Y41T";

-    case IMGFMT_Y42T: return "Packed Y42T";

-    case IMGFMT_V422: return "Packed V422";

-    case IMGFMT_V655: return "Packed V655";

-    case IMGFMT_CLJR: return "Packed CLJR";

-    case IMGFMT_YUVP: return "Packed YUVP";

-    case IMGFMT_UYVP: return "Packed UYVP";

-    case IMGFMT_MPEGPES:         return "Mpeg PES";

-    case IMGFMT_ZRMJPEGNI:       return "Zoran MJPEG non-interlaced";

-    case IMGFMT_ZRMJPEGIT:       return "Zoran MJPEG top field first";

-    case IMGFMT_ZRMJPEGIB:       return "Zoran MJPEG bottom field first";

-    case IMGFMT_XVMC_MOCO_MPEG2: return "MPEG1/2 Motion Compensation";

-    case IMGFMT_XVMC_IDCT_MPEG2: return "MPEG1/2 Motion Compensation and IDCT";

-    case IMGFMT_VDPAU_MPEG1:     return "MPEG1 VDPAU acceleration";

-    case IMGFMT_VDPAU_MPEG2:     return "MPEG2 VDPAU acceleration";

-    case IMGFMT_VDPAU_H264:      return "H.264 VDPAU acceleration";

-    case IMGFMT_VDPAU_MPEG4:     return "MPEG-4 Part 2 VDPAU acceleration";

-    case IMGFMT_VDPAU_WMV3:      return "WMV3 VDPAU acceleration";

-    case IMGFMT_VDPAU_VC1:       return "VC1 VDPAU acceleration";

-    }

-    snprintf(unknown_format,20,"Unknown 0x%04x",format);

-    return unknown_format;

-}

-

-int ff_mp_get_chroma_shift(int format, int *x_shift, int *y_shift, int *component_bits)

-{

-    int xs = 0, ys = 0;

-    int bpp;

-    int err = 0;

-    int bits = 8;

-    if ((format & 0xff0000f0) == 0x34000050)

-        format = av_bswap32(format);

-    if ((format & 0xf00000ff) == 0x50000034) {

-        switch (format >> 24) {

-        case 0x50:

-            break;

-        case 0x51:

-            bits = 16;

-            break;

-        case 0x52:

-            bits = 10;

-            break;

-        case 0x53:

-            bits = 9;

-            break;

-        default:

-            err = 1;

-            break;

-        }

-        switch (format & 0x00ffffff) {

-        case 0x00343434: // 444

-            xs = 0;

-            ys = 0;

-            break;

-        case 0x00323234: // 422

-            xs = 1;

-            ys = 0;

-            break;

-        case 0x00303234: // 420

-            xs = 1;

-            ys = 1;

-            break;

-        case 0x00313134: // 411

-            xs = 2;

-            ys = 0;

-            break;

-        case 0x00303434: // 440

-            xs = 0;

-            ys = 1;

-            break;

-        default:

-            err = 1;

-            break;

-        }

-    } else switch (format) {

-    case IMGFMT_444A:

-        xs = 0;

-        ys = 0;

-        break;

-    case IMGFMT_422A:

-        xs = 1;

-        ys = 0;

-        break;

-    case IMGFMT_420A:

-    case IMGFMT_I420:

-    case IMGFMT_IYUV:

-    case IMGFMT_YV12:

-        xs = 1;

-        ys = 1;

-        break;

-    case IMGFMT_IF09:

-    case IMGFMT_YVU9:

-        xs = 2;

-        ys = 2;

-        break;

-    case IMGFMT_Y8:

-    case IMGFMT_Y800:

-        xs = 31;

-        ys = 31;

-        break;

-    case IMGFMT_NV12:

-    case IMGFMT_NV21:

-        xs = 1;

-        ys = 1;

-        // TODO: allowing this though currently breaks

-        // things all over the place.

-        err = 1;

-        break;

-    default:

-        err = 1;

-        break;

-    }

-    if (x_shift) *x_shift = xs;

-    if (y_shift) *y_shift = ys;

-    if (component_bits) *component_bits = bits;

-    bpp = 8 + ((16 >> xs) >> ys);

-    if (format == IMGFMT_420A || format == IMGFMT_422A || format == IMGFMT_444A)

-        bpp += 8;

-    bpp *= (bits + 7) >> 3;

-    return err ? 0 : bpp;

-}

deleted file mode 100644

@@ -1,309 +0,0 @@

-/*

- * This file is part of MPlayer.

- *

- * MPlayer is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * MPlayer 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 General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License along

- * with MPlayer; if not, write to the Free Software Foundation, Inc.,

- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

- */

-

-#ifndef MPLAYER_IMG_FORMAT_H

-#define MPLAYER_IMG_FORMAT_H

-

-#include "config.h"

-

-/* RGB/BGR Formats */

-

-#define IMGFMT_RGB_MASK 0xFFFFFF00

-#define IMGFMT_RGB (('R'<<24)|('G'<<16)|('B'<<8))

-#define IMGFMT_RGB1  (IMGFMT_RGB|1)

-#define IMGFMT_RGB4  (IMGFMT_RGB|4)

-#define IMGFMT_RGB4_CHAR  (IMGFMT_RGB|4|128) // RGB4 with 1 pixel per byte

-#define IMGFMT_RGB8  (IMGFMT_RGB|8)

-#define IMGFMT_RGB12 (IMGFMT_RGB|12)

-#define IMGFMT_RGB15 (IMGFMT_RGB|15)

-#define IMGFMT_RGB16 (IMGFMT_RGB|16)

-#define IMGFMT_RGB24 (IMGFMT_RGB|24)

-#define IMGFMT_RGB32 (IMGFMT_RGB|32)

-#define IMGFMT_RGB48LE (IMGFMT_RGB|48)

-#define IMGFMT_RGB48BE (IMGFMT_RGB|48|128)

-#define IMGFMT_RGB64LE (IMGFMT_RGB|64)

-#define IMGFMT_RGB64BE (IMGFMT_RGB|64|128)

-

-#define IMGFMT_BGR_MASK 0xFFFFFF00

-#define IMGFMT_BGR (('B'<<24)|('G'<<16)|('R'<<8))

-#define IMGFMT_BGR1  (IMGFMT_BGR|1)

-#define IMGFMT_BGR4  (IMGFMT_BGR|4)

-#define IMGFMT_BGR4_CHAR (IMGFMT_BGR|4|128) // BGR4 with 1 pixel per byte

-#define IMGFMT_BGR8  (IMGFMT_BGR|8)

-#define IMGFMT_BGR12 (IMGFMT_BGR|12)

-#define IMGFMT_BGR15 (IMGFMT_BGR|15)

-#define IMGFMT_BGR16 (IMGFMT_BGR|16)

-#define IMGFMT_BGR24 (IMGFMT_BGR|24)

-#define IMGFMT_BGR32 (IMGFMT_BGR|32)

-

-#define IMGFMT_XYZ_MASK 0xFFFFFF00

-#define IMGFMT_XYZ (('X'<<24)|('Y'<<16)|('Z'<<8))

-#define IMGFMT_XYZ12LE (IMGFMT_XYZ|12)

-#define IMGFMT_XYZ12BE (IMGFMT_XYZ|12|128)

-

-#define IMGFMT_GBR24P (('G'<<24)|('B'<<16)|('R'<<8)|24)

-#define IMGFMT_GBR12PLE (('G'<<24)|('B'<<16)|('R'<<8)|36)

-#define IMGFMT_GBR12PBE (('G'<<24)|('B'<<16)|('R'<<8)|36|128)

-#define IMGFMT_GBR14PLE (('G'<<24)|('B'<<16)|('R'<<8)|42)

-#define IMGFMT_GBR14PBE (('G'<<24)|('B'<<16)|('R'<<8)|42|128)

-

-#if HAVE_BIGENDIAN

-#define IMGFMT_ABGR    IMGFMT_RGB32

-#define IMGFMT_BGRA    (IMGFMT_RGB32|128)

-#define IMGFMT_ARGB    IMGFMT_BGR32

-#define IMGFMT_RGBA    (IMGFMT_BGR32|128)

-#define IMGFMT_RGB64NE IMGFMT_RGB64BE

-#define IMGFMT_RGB48NE IMGFMT_RGB48BE

-#define IMGFMT_RGB12BE IMGFMT_RGB12

-#define IMGFMT_RGB12LE (IMGFMT_RGB12|128)

-#define IMGFMT_RGB15BE IMGFMT_RGB15

-#define IMGFMT_RGB15LE (IMGFMT_RGB15|128)

-#define IMGFMT_RGB16BE IMGFMT_RGB16

-#define IMGFMT_RGB16LE (IMGFMT_RGB16|128)

-#define IMGFMT_BGR12BE IMGFMT_BGR12

-#define IMGFMT_BGR12LE (IMGFMT_BGR12|128)

-#define IMGFMT_BGR15BE IMGFMT_BGR15

-#define IMGFMT_BGR15LE (IMGFMT_BGR15|128)

-#define IMGFMT_BGR16BE IMGFMT_BGR16

-#define IMGFMT_BGR16LE (IMGFMT_BGR16|128)

-#define IMGFMT_XYZ12  IMGFMT_XYZ12BE

-#define IMGFMT_GBR12P IMGFMT_GBR12PBE

-#define IMGFMT_GBR14P IMGFMT_GBR14PBE

-#else

-#define IMGFMT_ABGR (IMGFMT_BGR32|128)

-#define IMGFMT_BGRA IMGFMT_BGR32

-#define IMGFMT_ARGB (IMGFMT_RGB32|128)

-#define IMGFMT_RGBA IMGFMT_RGB32

-#define IMGFMT_RGB64NE IMGFMT_RGB64LE

-#define IMGFMT_RGB48NE IMGFMT_RGB48LE

-#define IMGFMT_RGB12BE (IMGFMT_RGB12|128)

-#define IMGFMT_RGB12LE IMGFMT_RGB12

-#define IMGFMT_RGB15BE (IMGFMT_RGB15|128)

-#define IMGFMT_RGB15LE IMGFMT_RGB15

-#define IMGFMT_RGB16BE (IMGFMT_RGB16|128)

-#define IMGFMT_RGB16LE IMGFMT_RGB16

-#define IMGFMT_BGR12BE (IMGFMT_BGR12|128)

-#define IMGFMT_BGR12LE IMGFMT_BGR12

-#define IMGFMT_BGR15BE (IMGFMT_BGR15|128)

-#define IMGFMT_BGR15LE IMGFMT_BGR15

-#define IMGFMT_BGR16BE (IMGFMT_BGR16|128)

-#define IMGFMT_BGR16LE IMGFMT_BGR16

-#define IMGFMT_XYZ12  IMGFMT_XYZ12LE

-#define IMGFMT_GBR12P IMGFMT_GBR12PLE

-#define IMGFMT_GBR14P IMGFMT_GBR14PLE

-#endif

-

-/* old names for compatibility */

-#define IMGFMT_RG4B  IMGFMT_RGB4_CHAR

-#define IMGFMT_BG4B  IMGFMT_BGR4_CHAR

-

-#define IMGFMT_IS_RGB(fmt) (((fmt)&IMGFMT_RGB_MASK)==IMGFMT_RGB)

-#define IMGFMT_IS_BGR(fmt) (((fmt)&IMGFMT_BGR_MASK)==IMGFMT_BGR)

-#define IMGFMT_IS_XYZ(fmt) (((fmt)&IMGFMT_XYZ_MASK)==IMGFMT_XYZ)

-

-#define IMGFMT_RGB_DEPTH(fmt) ((fmt)&0x7F)

-#define IMGFMT_BGR_DEPTH(fmt) ((fmt)&0x7F)

-#define IMGFMT_XYZ_DEPTH(fmt) ((fmt)&0x7F)

-

-

-/* Planar YUV Formats */

-

-#define IMGFMT_YVU9 0x39555659

-#define IMGFMT_IF09 0x39304649

-#define IMGFMT_YV12 0x32315659

-#define IMGFMT_I420 0x30323449

-#define IMGFMT_IYUV 0x56555949

-#define IMGFMT_CLPL 0x4C504C43

-#define IMGFMT_Y800 0x30303859

-#define IMGFMT_Y8   0x20203859

-#define IMGFMT_NV12 0x3231564E

-#define IMGFMT_NV21 0x3132564E

-#define IMGFMT_Y16_LE 0x20363159

-

-/* unofficial Planar Formats, FIXME if official 4CC exists */

-#define IMGFMT_444P 0x50343434

-#define IMGFMT_422P 0x50323234

-#define IMGFMT_411P 0x50313134

-#define IMGFMT_440P 0x50303434

-#define IMGFMT_HM12 0x32314D48

-#define IMGFMT_Y16_BE 0x59313620

-

-// Gray with alpha

-#define IMGFMT_Y8A 0x59320008

-// 4:2:0 planar with alpha

-#define IMGFMT_420A 0x41303234

-// 4:2:2 planar with alpha

-#define IMGFMT_422A 0x41323234

-// 4:4:4 planar with alpha

-#define IMGFMT_444A 0x41343434

-

-#define IMGFMT_444P16_LE 0x51343434

-#define IMGFMT_444P16_BE 0x34343451

-#define IMGFMT_444P14_LE 0x54343434

-#define IMGFMT_444P14_BE 0x34343454

-#define IMGFMT_444P12_LE 0x55343434

-#define IMGFMT_444P12_BE 0x34343455

-#define IMGFMT_444P10_LE 0x52343434

-#define IMGFMT_444P10_BE 0x34343452

-#define IMGFMT_444P9_LE  0x53343434

-#define IMGFMT_444P9_BE  0x34343453

-#define IMGFMT_422P16_LE 0x51323234

-#define IMGFMT_422P16_BE 0x34323251

-#define IMGFMT_422P14_LE 0x54323234

-#define IMGFMT_422P14_BE 0x34323254

-#define IMGFMT_422P12_LE 0x55323234

-#define IMGFMT_422P12_BE 0x34323255

-#define IMGFMT_422P10_LE 0x52323234

-#define IMGFMT_422P10_BE 0x34323252

-#define IMGFMT_422P9_LE  0x53323234

-#define IMGFMT_422P9_BE  0x34323253

-#define IMGFMT_420P16_LE 0x51303234

-#define IMGFMT_420P16_BE 0x34323051

-#define IMGFMT_420P14_LE 0x54303234

-#define IMGFMT_420P14_BE 0x34323054

-#define IMGFMT_420P12_LE 0x55303234

-#define IMGFMT_420P12_BE 0x34323055

-#define IMGFMT_420P10_LE 0x52303234

-#define IMGFMT_420P10_BE 0x34323052

-#define IMGFMT_420P9_LE  0x53303234

-#define IMGFMT_420P9_BE  0x34323053

-#if HAVE_BIGENDIAN

-#define IMGFMT_444P16 IMGFMT_444P16_BE

-#define IMGFMT_444P14 IMGFMT_444P14_BE

-#define IMGFMT_444P12 IMGFMT_444P12_BE

-#define IMGFMT_444P10 IMGFMT_444P10_BE

-#define IMGFMT_444P9  IMGFMT_444P9_BE

-#define IMGFMT_422P16 IMGFMT_422P16_BE

-#define IMGFMT_422P14 IMGFMT_422P14_BE

-#define IMGFMT_422P12 IMGFMT_422P12_BE

-#define IMGFMT_422P10 IMGFMT_422P10_BE

-#define IMGFMT_422P9  IMGFMT_422P9_BE

-#define IMGFMT_420P16 IMGFMT_420P16_BE

-#define IMGFMT_420P14 IMGFMT_420P14_BE

-#define IMGFMT_420P12 IMGFMT_420P12_BE

-#define IMGFMT_420P10 IMGFMT_420P10_BE

-#define IMGFMT_420P9  IMGFMT_420P9_BE

-#define IMGFMT_Y16    IMGFMT_Y16_BE

-#define IMGFMT_IS_YUVP16_NE(fmt) IMGFMT_IS_YUVP16_BE(fmt)

-#else

-#define IMGFMT_444P16 IMGFMT_444P16_LE

-#define IMGFMT_444P14 IMGFMT_444P14_LE

-#define IMGFMT_444P12 IMGFMT_444P12_LE

-#define IMGFMT_444P10 IMGFMT_444P10_LE

-#define IMGFMT_444P9  IMGFMT_444P9_LE

-#define IMGFMT_422P16 IMGFMT_422P16_LE

-#define IMGFMT_422P14 IMGFMT_422P14_LE

-#define IMGFMT_422P12 IMGFMT_422P12_LE

-#define IMGFMT_422P10 IMGFMT_422P10_LE

-#define IMGFMT_422P9  IMGFMT_422P9_LE

-#define IMGFMT_420P16 IMGFMT_420P16_LE

-#define IMGFMT_420P14 IMGFMT_420P14_LE

-#define IMGFMT_420P12 IMGFMT_420P12_LE

-#define IMGFMT_420P10 IMGFMT_420P10_LE

-#define IMGFMT_420P9  IMGFMT_420P9_LE

-#define IMGFMT_Y16    IMGFMT_Y16_LE

-#define IMGFMT_IS_YUVP16_NE(fmt) IMGFMT_IS_YUVP16_LE(fmt)

-#endif

-

-#define IMGFMT_IS_YUVP16_LE(fmt) (((fmt - 0x51000034) & 0xfc0000ff) == 0)

-#define IMGFMT_IS_YUVP16_BE(fmt) (((fmt - 0x34000051) & 0xff0000fc) == 0)

-#define IMGFMT_IS_YUVP16(fmt)    (IMGFMT_IS_YUVP16_LE(fmt) || IMGFMT_IS_YUVP16_BE(fmt))

-

-/**

- * \brief Find the corresponding full 16 bit format, i.e. IMGFMT_420P10_LE -> IMGFMT_420P16_LE

- * \return normalized format ID or 0 if none exists.

- */

-static inline int normalize_yuvp16(int fmt) {

-    if (IMGFMT_IS_YUVP16_LE(fmt))

-        return (fmt & 0x00ffffff) | 0x51000000;

-    if (IMGFMT_IS_YUVP16_BE(fmt))

-        return (fmt & 0xffffff00) | 0x00000051;

-    return 0;

-}

-

-/* Packed YUV Formats */

-

-#define IMGFMT_IUYV 0x56595549 // Interlaced UYVY

-#define IMGFMT_IY41 0x31435949 // Interlaced Y41P

-#define IMGFMT_IYU1 0x31555949

-#define IMGFMT_IYU2 0x32555949

-#define IMGFMT_UYVY 0x59565955

-#define IMGFMT_UYNV 0x564E5955 // Exactly same as UYVY

-#define IMGFMT_cyuv 0x76757963 // upside-down UYVY

-#define IMGFMT_Y422 0x32323459 // Exactly same as UYVY

-#define IMGFMT_YUY2 0x32595559

-#define IMGFMT_YUNV 0x564E5559 // Exactly same as YUY2

-#define IMGFMT_YVYU 0x55595659

-#define IMGFMT_Y41P 0x50313459

-#define IMGFMT_Y211 0x31313259

-#define IMGFMT_Y41T 0x54313459 // Y41P, Y lsb = transparency

-#define IMGFMT_Y42T 0x54323459 // UYVY, Y lsb = transparency

-#define IMGFMT_V422 0x32323456 // upside-down UYVY?

-#define IMGFMT_V655 0x35353656

-#define IMGFMT_CLJR 0x524A4C43

-#define IMGFMT_YUVP 0x50565559 // 10-bit YUYV

-#define IMGFMT_UYVP 0x50565955 // 10-bit UYVY

-

-/* Compressed Formats */

-#define IMGFMT_MPEGPES (('M'<<24)|('P'<<16)|('E'<<8)|('S'))

-#define IMGFMT_MJPEG (('M')|('J'<<8)|('P'<<16)|('G'<<24))

-/* Formats that are understood by zoran chips, we include

- * non-interlaced, interlaced top-first, interlaced bottom-first */

-#define IMGFMT_ZRMJPEGNI  (('Z'<<24)|('R'<<16)|('N'<<8)|('I'))

-#define IMGFMT_ZRMJPEGIT (('Z'<<24)|('R'<<16)|('I'<<8)|('T'))

-#define IMGFMT_ZRMJPEGIB (('Z'<<24)|('R'<<16)|('I'<<8)|('B'))

-

-// I think that this code could not be used by any other codec/format

-#define IMGFMT_XVMC 0x1DC70000

-#define IMGFMT_XVMC_MASK 0xFFFF0000

-#define IMGFMT_IS_XVMC(fmt) (((fmt)&IMGFMT_XVMC_MASK)==IMGFMT_XVMC)

-//these are chroma420

-#define IMGFMT_XVMC_MOCO_MPEG2 (IMGFMT_XVMC|0x02)

-#define IMGFMT_XVMC_IDCT_MPEG2 (IMGFMT_XVMC|0x82)

-

-// VDPAU specific format.

-#define IMGFMT_VDPAU               0x1DC80000

-#define IMGFMT_VDPAU_MASK          0xFFFF0000

-#define IMGFMT_IS_VDPAU(fmt)       (((fmt)&IMGFMT_VDPAU_MASK)==IMGFMT_VDPAU)

-#define IMGFMT_VDPAU_MPEG1         (IMGFMT_VDPAU|0x01)

-#define IMGFMT_VDPAU_MPEG2         (IMGFMT_VDPAU|0x02)

-#define IMGFMT_VDPAU_H264          (IMGFMT_VDPAU|0x03)

-#define IMGFMT_VDPAU_WMV3          (IMGFMT_VDPAU|0x04)

-#define IMGFMT_VDPAU_VC1           (IMGFMT_VDPAU|0x05)

-#define IMGFMT_VDPAU_MPEG4         (IMGFMT_VDPAU|0x06)

-

-#define IMGFMT_IS_HWACCEL(fmt) (IMGFMT_IS_VDPAU(fmt) || IMGFMT_IS_XVMC(fmt))

-

-typedef struct {

-    void* data;

-    int size;

-    int id;        // stream id. usually 0x1E0

-    int timestamp; // pts, 90000 Hz counter based

-} vo_mpegpes_t;

-

-const char *ff_vo_format_name(int format);

-

-/**

- * Calculates the scale shifts for the chroma planes for planar YUV

- *

- * \param component_bits bits per component

- * \return bits-per-pixel for format if successful (i.e. format is 3 or 4-planes planar YUV), 0 otherwise

- */

-int ff_mp_get_chroma_shift(int format, int *x_shift, int *y_shift, int *component_bits);

-

-#endif /* MPLAYER_IMG_FORMAT_H */

deleted file mode 100644

@@ -1,99 +0,0 @@

-/*

- * This file is part of MPlayer.

- *

- * MPlayer 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.

- *

- * MPlayer 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 MPlayer; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

- */

-

-#ifndef MPLAYER_FASTMEMCPY_H

-#define MPLAYER_FASTMEMCPY_H

-

-#include <inttypes.h>

-#include <string.h>

-#include <stddef.h>

-

-void * fast_memcpy(void * to, const void * from, size_t len);

-void * mem2agpcpy(void * to, const void * from, size_t len);

-

-#if ! defined(CONFIG_FASTMEMCPY) || ! (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW /* || HAVE_SSE || HAVE_SSE2 */)

-#define mem2agpcpy(a,b,c) memcpy(a,b,c)

-#define fast_memcpy(a,b,c) memcpy(a,b,c)

-#endif

-

-static inline void * mem2agpcpy_pic(void * dst, const void * src, int bytesPerLine, int height, int dstStride, int srcStride)

-{

-    int i;

-    void *retval=dst;

-

-    if(dstStride == srcStride)

-    {

-        if (srcStride < 0) {

-                src = (const uint8_t*)src + (height-1)*srcStride;

-                dst = (uint8_t*)dst + (height-1)*dstStride;

-                srcStride = -srcStride;

-        }

-

-        mem2agpcpy(dst, src, srcStride*height);

-    }

-    else

-    {

-        for(i=0; i<height; i++)

-        {

-            mem2agpcpy(dst, src, bytesPerLine);

-            src = (const uint8_t*)src + srcStride;

-            dst = (uint8_t*)dst + dstStride;

-        }

-    }

-

-    return retval;

-}

-

-#define memcpy_pic(d, s, b, h, ds, ss) memcpy_pic2(d, s, b, h, ds, ss, 0)

-#define my_memcpy_pic(d, s, b, h, ds, ss) memcpy_pic2(d, s, b, h, ds, ss, 1)

-

-/**

- * \param limit2width always skip data between end of line and start of next

- *                    instead of copying the full block when strides are the same

- */

-static inline void * memcpy_pic2(void * dst, const void * src,

-                                 int bytesPerLine, int height,

-                                 int dstStride, int srcStride, int limit2width)

-{

-    int i;

-    void *retval=dst;

-

-    if(!limit2width && dstStride == srcStride)

-    {

-        if (srcStride < 0) {

-                src = (const uint8_t*)src + (height-1)*srcStride;

-                dst = (uint8_t*)dst + (height-1)*dstStride;

-                srcStride = -srcStride;

-        }

-

-        fast_memcpy(dst, src, srcStride*height);

-    }

-    else

-    {

-        for(i=0; i<height; i++)

-        {

-            fast_memcpy(dst, src, bytesPerLine);

-            src = (const uint8_t*)src + srcStride;

-            dst = (uint8_t*)dst + dstStride;

-        }

-    }

-

-    return retval;

-}

-

-#endif /* MPLAYER_FASTMEMCPY_H */

deleted file mode 100644

@@ -1,257 +0,0 @@

-/*

- * This file is part of MPlayer.

- *

- * MPlayer is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * MPlayer 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 General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License along

- * with MPlayer; if not, write to the Free Software Foundation, Inc.,

- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

- */

-

-#include "config.h"

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

-#if HAVE_MALLOC_H

-#include <malloc.h>

-#endif

-

-#include "img_format.h"

-#include "mp_image.h"

-

-#include "libvo/fastmemcpy.h"

-//#include "libavutil/mem.h"

-#include "libavutil/imgutils.h"

-

-void ff_mp_image_alloc_planes(mp_image_t *mpi) {

-    uint32_t temp[256];

-    if (avpriv_set_systematic_pal2(temp, ff_mp2ff_pix_fmt(mpi->imgfmt)) >= 0)

-        mpi->flags |= MP_IMGFLAG_RGB_PALETTE;

-

-  // IF09 - allocate space for 4. plane delta info - unused

-  if (mpi->imgfmt == IMGFMT_IF09) {

-    mpi->planes[0]=av_malloc(mpi->bpp*mpi->width*(mpi->height+2)/8+

-                            mpi->chroma_width*mpi->chroma_height);

-  } else

-    mpi->planes[0]=av_malloc(mpi->bpp*mpi->width*(mpi->height+2)/8);

-  if (mpi->flags&MP_IMGFLAG_PLANAR) {

-    int bpp = IMGFMT_IS_YUVP16(mpi->imgfmt)? 2 : 1;

-    // YV12/I420/YVU9/IF09. feel free to add other planar formats here...

-    mpi->stride[0]=mpi->stride[3]=bpp*mpi->width;