From bbd62fc1bffdd0509615f90e9513447fca9e40e5 Mon Sep 17 00:00:00 2001 From: rafael2k Date: Sun, 3 May 2009 06:08:30 +0000 Subject: cinelerra fix and patch added git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@457 18ef50b8-d735-4ccd-97c1-689132df3dd9 --- media/video/cinelerra/cinelerra-git_version.diff | 35 ++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 media/video/cinelerra/cinelerra-git_version.diff (limited to 'media/video/cinelerra/cinelerra-git_version.diff') diff --git a/media/video/cinelerra/cinelerra-git_version.diff b/media/video/cinelerra/cinelerra-git_version.diff new file mode 100644 index 0000000..04352db --- /dev/null +++ b/media/video/cinelerra/cinelerra-git_version.diff @@ -0,0 +1,35 @@ +diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C +index 85e5614..6cea249 100644 +--- a/cinelerra/ffmpeg.C ++++ b/cinelerra/ffmpeg.C +@@ -6,6 +6,13 @@ extern "C" { + } + #endif + ++/* fix for newer ffmpeg */ ++#ifndef PIX_FMT_YUV422 ++#define PIX_FMT_YUV422 PIX_FMT_YUYV422 ++#endif ++#ifndef PIX_FMT_RGBA32 ++#define PIX_FMT_RGBA32 PIX_FMT_RGB32 ++#endif + + #include "filebase.h" + #include "quicktime.h" +diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c +index 594a213..a6d272c 100644 +--- a/quicktime/qtffmpeg.c ++++ b/quicktime/qtffmpeg.c +@@ -8,8 +8,10 @@ + // FFMPEG front end for quicktime. + + +- +- ++// fix for newer ffmpeg, don't break w/ older ones... ++#ifndef PIX_FMT_YUV422 ++#define PIX_FMT_YUV422 PIX_FMT_YUYV422 ++#endif + + + -- cgit v1.2.3