[SCM] vlc/ubuntu: Fixed wrong aspect ratio in transcoded image from webcam. (LP: #672304)

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

The following commit has been merged in the ubuntu branch:
commit 1cfcff771da47b538983d21ecdbe74a2e18058c8
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Nov 19 00:29:33 2010 +0100

    Fixed wrong aspect ratio in transcoded image from webcam. (LP: #672304)

diff --git a/debian/changelog b/debian/changelog
index 80484ce..5710a89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vlc (1.1.5-1ubuntu2) natty; urgency=low
+
+  * Fixed wrong aspect ratio in transcoded image from webcam. (LP: #672304)
+
+ -- Nicola Ferralis <feranick at hotmail.com>  Fri, 19 Nov 2010 00:15:09 +0100
+
 vlc (1.1.5-1ubuntu1) natty; urgency=low
 
   * Merge from Debian experimental, remaining changes:
diff --git a/debian/patches/300_transcode_aspect_ratio.diff b/debian/patches/300_transcode_aspect_ratio.diff
new file mode 100644
index 0000000..df24320
--- /dev/null
+++ b/debian/patches/300_transcode_aspect_ratio.diff
@@ -0,0 +1,19 @@
+Description: Fixed wrong aspect ratio in transcoded image from webcam.
+Author: Nicola Ferralis <feranick at hotmail.com>
+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