diff options
| author | rhatto <rhatto@18ef50b8-d735-4ccd-97c1-689132df3dd9> | 2009-05-04 15:39:57 +0000 |
|---|---|---|
| committer | rhatto <rhatto@18ef50b8-d735-4ccd-97c1-689132df3dd9> | 2009-05-04 15:39:57 +0000 |
| commit | b2e0d26b08b24733e6cd9cfbf77d54ce7755a036 (patch) | |
| tree | 74c7826656c28e2b57cc5a4f2ff0393195eb30fd /media/video/cinelerra/cinelerra.diff | |
| parent | ce5e3b3388d45675be3ca70fca6176132006a40d (diff) | |
| download | mkbuilds-b2e0d26b08b24733e6cd9cfbf77d54ce7755a036.tar.gz mkbuilds-b2e0d26b08b24733e6cd9cfbf77d54ce7755a036.tar.bz2 | |
cinelerra: fixing patch name
git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@462 18ef50b8-d735-4ccd-97c1-689132df3dd9
Diffstat (limited to 'media/video/cinelerra/cinelerra.diff')
| -rw-r--r-- | media/video/cinelerra/cinelerra.diff | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/media/video/cinelerra/cinelerra.diff b/media/video/cinelerra/cinelerra.diff new file mode 100644 index 0000000..04352db --- /dev/null +++ b/media/video/cinelerra/cinelerra.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 + + + |