Date: Sat, 13 Jun 2009 16:07:04 +1100 From: Dima Panov <Fluffy@fluffy.khv.ru> To: freebsd-ports-bugs@freebsd.org Cc: Alberto Villa <villa.alberto@gmail.com> Subject: Re: ports/134632: [patch] Update port: multimedia/ffmpeg 2009-05-15 Message-ID: <200906131607.06823.Fluffy@fluffy.khv.ru> In-Reply-To: <200905172250.n4HMoXM1040813@www.freebsd.org> References: <200905172250.n4HMoXM1040813@www.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Monday 18 May 2009 09:50:33 Alberto Villa wrote:
> >Number: 134632
> >Category: ports
> >Synopsis: [patch] Update port: multimedia/ffmpeg 2009-05-15
> >Arrival-Date: Sun May 17 23:00:07 UTC 2009
> >Originator: Alberto Villa
> >Description:
>
> an update for the ffmpeg port
multimedia/libquicktime is broken by new library.
very dirty hack is:
==========
--- plugins/ffmpeg/video.c.orig 2008-12-02 05:45:29.000000000 +1000
+++ plugins/ffmpeg/video.c 2009-06-13 16:00:18.000000000 +1100
@@ -102,7 +102,6 @@
colormodels[] =
{
{ PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per
2x2 Y samples)
- { PIX_FMT_YUV422, BC_YUV422, 1 },
{ PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel,
RGBRGB...
{ PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel,
BGRBGR...
{ PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per
2x1 Y samples)
@@ -112,7 +111,7 @@
{ PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg)
{ PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg)
{ PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg)
- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel,
BGRABGRA...
+ { PIX_FMT_BGRA, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel,
BGRABGRA...
{ PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most
significant bit to 1
{ PIX_FMT_GRAY8, BC_RGB888, 0 },
{ PIX_FMT_MONOWHITE, BC_RGB888, 0 },///< 0 is white
@@ -296,7 +295,7 @@
* Could someone please tell me, how people can make such a brain dead
* RGBA format like in ffmpeg??
*/
- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))
+ if((in_format == PIX_FMT_BGRA) && (out_format == BC_RGBA8888))
{
convert_image_decode_rgba(in_frame, out_frame, width, height);
return;
@@ -537,7 +536,7 @@
#ifdef HAVE_LIBSWSCALE
- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) &&
+ if(!((codec->avctx->pix_fmt == PIX_FMT_BGRA) &&
(vtrack->stream_cmodel == BC_RGBA8888)))
{
codec->swsContext =
==========
--
Dmitry "Red Fox" Panov @ Home | KDE@FreeBSD Team | FreeBSD since September 1995
Khabarovsk, Russia | Skype:dima.panov | Jabber.org:fluffy.khv | ICQ:1745024
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906131607.06823.Fluffy>