[SCM] devede/master: Fix incorrect result size.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 73f53762a246a635a66b2d8895d6ceed79638f95
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Aug 18 18:31:05 2013 +0100

    Fix incorrect result size.
    
    Closes: #714075
    Thanks: Petr Gajdůšek for the patch.

diff --git a/debian/patches/02-fix_avconv_bitrate.patch b/debian/patches/02-fix_avconv_bitrate.patch
new file mode 100644
index 0000000..7d298b9
--- /dev/null
+++ b/debian/patches/02-fix_avconv_bitrate.patch
@@ -0,0 +1,22 @@
+Description: Correctly pass bitrate to avconv
+ Use -b <bitrate> which overrides default values comming from -target option,
+ rather than -b:v <bitrate> which does not.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714075
+Author: Petr Gajdůšek <gajdusek.petr at centrum.cz>
+Last-Update: 2013-08-18
+Reviewed-by: Alessio Treglia <alessio at debian.org>
+---
+ devede_avconv_convert.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- devede.orig/devede_avconv_convert.py
++++ devede/devede_avconv_convert.py
+@@ -473,7 +473,7 @@ class video_converter_ffmpeg(devede_exec
+ 				command_var.append("2")
+ 	
+ 			if (vcd==False):
+-				command_var.append("-b:v")
++				command_var.append("-b")
+ 				command_var.append(str(videorate)+"k")
+ 		
+ 			#if disctype!="divx":
diff --git a/debian/patches/series b/debian/patches/series
index 200bee2..aeebd39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-fix_building.patch
+02-fix_avconv_bitrate.patch

-- 
devede packaging