From a1ec7ced9d17f54c88ee7cbcebd257b077ddc7ba Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 22:53:30 +0200 Subject: [PATCH] ffmpeg-0.10.2-gcc2.patch: make "git apply" happy --- media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch b/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch index 48b059d5a..7c7f0231f 100644 --- a/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch +++ b/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch @@ -210,8 +210,8 @@ index e1ba799..3820056 100644 av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n", av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat)); diff --git a/configure b/configure ---- ffmpeg-0.10.2/configure 2012-01-26 22:15:59.047710208 +0000 -+++ ffmpeg-0.10-haiku/configure 2012-03-28 22:30:34.330563584 +0000 +--- ffmpeg-0.10.2/configure ++++ ffmpeg-0.10-haiku/configure @@ -1359,7 +1359,6 @@ aligned_stack_if_any="ppc x86"