[SCM] wxsvg/master: Update libav10.patch against the new sources.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 177d1da71205b89a3d46fae44079c239000f7edb
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 15 15:31:59 2014 +0100

    Update libav10.patch against the new sources.

diff --git a/debian/patches/libav10.patch b/debian/patches/libav10.patch
index b90af2a..dc2144a 100644
--- a/debian/patches/libav10.patch
+++ b/debian/patches/libav10.patch
@@ -1,20 +1,27 @@
 Description: Fix build failure with libav 10
 Author: Anton Khirnov <anton at khirnov.net>
 Bug-Debian: https://bugs.debian.org/739454
-Last-Update: 2014-02-25
+Reviewed-by: Alessio Treglia <alessio at debian.org>
+Last-Update: 2014-04-15
+---
+ src/mediadec_ffmpeg.cpp |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: wxsvg-1.2~dfsg0/src/mediadec_ffmpeg.cpp
-===================================================================
---- wxsvg-1.2~dfsg0.orig/src/mediadec_ffmpeg.cpp	2013-02-13 14:38:11.000000000 +0000
-+++ wxsvg-1.2~dfsg0/src/mediadec_ffmpeg.cpp	2014-02-25 06:48:23.341289700 +0000
-@@ -108,8 +108,8 @@
+--- wxsvg.orig/src/mediadec_ffmpeg.cpp
++++ wxsvg/src/mediadec_ffmpeg.cpp
+@@ -112,11 +112,11 @@ float wxFfmpegMediaDecoder::GetFps() {
  	float result = -1;
  	for (unsigned int i = 0; i < m_formatCtx->nb_streams; i++) {
  		AVStream* st = m_formatCtx->streams[i];
 -		if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->r_frame_rate.num && st->r_frame_rate.den) {
--			result = ((float) st->r_frame_rate.num) / st->r_frame_rate.den;
+-			if (st->r_frame_rate.num > st->r_frame_rate.den)
+-				result = ((float) st->r_frame_rate.num) / st->r_frame_rate.den;
 +		if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->avg_frame_rate.num && st->avg_frame_rate.den) {
-+			result = ((float) st->avg_frame_rate.num) / st->avg_frame_rate.den;
++			if (st->avg_frame_rate.num > st->avg_frame_rate.den)
++				result = ((float) st->avg_frame_rate.num) / st->avg_frame_rate.den;
+ 			else
+-				result = ((float) st->r_frame_rate.den) / st->r_frame_rate.num;
++				result = ((float) st->avg_frame_rate.den) / st->avg_frame_rate.num;
  			break;
  		}
  	}

-- 
wxsvg packaging