[SCM] vlc/master: Fixed wrong aspect ratio in transcoded image from webcam.

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d872cb26e7f5722cafc167d86bedc8dc78d81d26
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Nov 24 00:19:08 2010 +0100

    Fixed wrong aspect ratio in transcoded image from webcam.
    
    Closes: #603888
    LP: #672304

diff --git a/debian/patches/300_transcode_aspect_ratio.diff b/debian/patches/300_transcode_aspect_ratio.diff
new file mode 100644
index 0000000..bdc2089
--- /dev/null
+++ b/debian/patches/300_transcode_aspect_ratio.diff
@@ -0,0 +1,21 @@
+Description: Fixed wrong aspect ratio in transcoded image from webcam.
+Origin: upstream, https://trac.videolan.org/vlc/ticket/4312
+Bug-Debian: http://bugs.debian.org/603888
+Bug-Ubuntu: https://launchpad.net/bugs/672304
+Applied-Upstream: 1.1.6
+
+diff -Nru vlc-1.1.5.orig//modules/stream_out/transcode/video.c vlc-1.1.5/modules/stream_out/transcode/video.c
+--- vlc-1.1.5.orig//modules/stream_out/transcode/video.c	2010-07-24 06:17:44.000000000 -0700
++++ vlc-1.1.5/modules/stream_out/transcode/video.c	2010-11-17 14:25:10.115084004 -0800
+@@ -435,6 +435,11 @@
+     if( id->p_encoder->fmt_out.video.i_sar_num <= 0 ||
+         id->p_encoder->fmt_out.video.i_sar_den <= 0 )
+     {
++	vlc_ureduce( &id->p_decoder->fmt_out.video.i_sar_num, 
++ 	                &id->p_decoder->fmt_out.video.i_sar_den, 
++ 	                id->p_decoder->fmt_out.video.i_sar_num, 
++ 	                id->p_decoder->fmt_out.video.i_sar_den, 
++ 	                0 ); 
+         id->p_encoder->fmt_out.video.i_sar_num = id->p_decoder->fmt_out.video.i_sar_num * i_src_width / i_dst_width;
+         id->p_encoder->fmt_out.video.i_sar_den = id->p_decoder->fmt_out.video.i_sar_den * i_src_height / i_dst_height;
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 495457d..39ffe16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 052_as-needed.diff
 200_osdmenu_paths.diff
+300_transcode_aspect_ratio.diff

-- 
VLC media player packaging