[SCM] devede/master: Drop 02-fix_avconv_bitrate.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Mar 1 13:38:27 UTC 2014


The following commit has been merged in the master branch:
commit 19b3161c196dc00400421992a92461706075fcd5
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Mar 1 13:33:43 2014 +0000

    Drop 02-fix_avconv_bitrate.patch, applied upstream.
    
    Closes: #714075

diff --git a/debian/patches/02-fix_avconv_bitrate.patch b/debian/patches/02-fix_avconv_bitrate.patch
deleted file mode 100644
index bff72b7..0000000
--- a/debian/patches/02-fix_avconv_bitrate.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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>
-Forwarded: https://github.com/rastersoft/Devede/issues/24
----
- 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 aeebd39..200bee2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-fix_building.patch
-02-fix_avconv_bitrate.patch

-- 
devede packaging



More information about the pkg-multimedia-commits mailing list