[SCM] libav/master: drop patch mathematics-remove-asserts-from-av_rescale_rnd.patch, merged upstream

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Feb 5 00:16:45 UTC 2014


The following commit has been merged in the master branch:
commit ae05c5bb3ce4eca39e58034402785393d3a19fe8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 5 00:05:34 2014 +0000

    drop patch mathematics-remove-asserts-from-av_rescale_rnd.patch, merged upstream

diff --git a/debian/patches/mathematics-remove-asserts-from-av_rescale_rnd.patch b/debian/patches/mathematics-remove-asserts-from-av_rescale_rnd.patch
deleted file mode 100644
index 51a82ee..0000000
--- a/debian/patches/mathematics-remove-asserts-from-av_rescale_rnd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 94a417acc05cc5151b473abc0bf51fad26f8c5a0 Mon Sep 17 00:00:00 2001
-From: Anton Khirnov <anton at khirnov.net>
-Date: Thu, 12 Dec 2013 07:34:13 +0100
-Subject: [PATCH] mathematics: remove asserts from av_rescale_rnd()
-
-It is a public function, it must not assert on its parameters.
----
- libavutil/mathematics.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c
-index 137683e..1a38f64 100644
---- a/libavutil/mathematics.c
-+++ b/libavutil/mathematics.c
-@@ -23,7 +23,6 @@
-  * miscellaneous math routines and tables
-  */
- 
--#include <assert.h>
- #include <stdint.h>
- #include <limits.h>
- 
-@@ -58,9 +57,9 @@ int64_t av_gcd(int64_t a, int64_t b){
- 
- int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd){
-     int64_t r=0;
--    assert(c > 0);
--    assert(b >=0);
--    assert((unsigned)rnd<=5 && rnd!=4);
-+
-+    if (c <= 0 || b < 0 || rnd == 4 || rnd > 5)
-+        return INT64_MIN;
- 
-     if(a<0 && a != INT64_MIN) return -av_rescale_rnd(-a, b, c, rnd ^ ((rnd>>1)&1));
- 
--- 
-1.8.1.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 828a23a..4bce132 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 spelling-errors.patch
 freetype-api.patch
 support-opus-in-ogg.patch
-mathematics-remove-asserts-from-av_rescale_rnd.patch

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list