[SCM] blender/master: debian/patches: #0012 dropped (applied upstream)

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Mon Mar 12 17:49:09 UTC 2012


The following commit has been merged in the master branch:
commit fc4e7d1ce96a3d24ae29918fbe19b8b68d7aff02
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Tue Feb 21 22:18:46 2012 +0100

    debian/patches: #0012 dropped (applied upstream)

diff --git a/debian/patches/0012-fix_implicit_declaration_of_av_rescale_q.patch b/debian/patches/0012-fix_implicit_declaration_of_av_rescale_q.patch
deleted file mode 100644
index 4bcd160..0000000
--- a/debian/patches/0012-fix_implicit_declaration_of_av_rescale_q.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Kevin Roy <kiniou at gmail.com>
-Date: Thu, 26 Jan 2012 23:54:09 +0100
-Subject: fix_implicit_declaration_of_av_rescale_q
-
----
- intern/ffmpeg/ffmpeg_compat.h |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
-index bb07576..156073f 100644
---- a/intern/ffmpeg/ffmpeg_compat.h
-+++ b/intern/ffmpeg/ffmpeg_compat.h
-@@ -36,6 +36,7 @@
- #include <libavcodec/avcodec.h>
- #include <libavutil/rational.h>
- #include <libavutil/mathematics.h>
-+#include <libavutil/opt.h>
- 
- #if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
- #define FFMPEG_HAVE_PARSE_UTILS 1
--- 

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list