[SCM] vlc/master: Drop backported patches.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2d755b669a1e817e5142d8507092bceae0618c50
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Jan 24 12:06:04 2011 +0100

    Drop backported patches.

diff --git a/debian/patches/300_transcode_aspect_ratio.diff b/debian/patches/300_transcode_aspect_ratio.diff
deleted file mode 100644
index bdc2089..0000000
--- a/debian/patches/300_transcode_aspect_ratio.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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/Fix-for-KDE-device-actions.patch b/debian/patches/Fix-for-KDE-device-actions.patch
deleted file mode 100644
index 2da726d..0000000
--- a/debian/patches/Fix-for-KDE-device-actions.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Lari Natri <lari.natri at gmail.com>
-Subject: [PATCH] Fix for KDE device actions
- This tiny patch enables opening of VideoCD/AudioCD/DVD discs with VLC in KDE
- when inserted, which was broken before.
-Origin: upstream, http://git.videolan.org/?p=vlc.git;a=commitdiff;h=99ebae0c04aa2ce0b3085fbba78f4245c713d9c2
-Bug-Ubuntu: https://launchpad.net/bugs/542293
-Applied-Upstream: 1.2.0
-
-diff --git a/share/solid/vlc-opencda.desktop b/share/solid/vlc-opencda.desktop
-index 4bdd52a..866e85f 100644
---- a/share/solid/vlc-opencda.desktop
-+++ b/share/solid/vlc-opencda.desktop
-@@ -5,6 +5,6 @@ Actions=open;
- 
- [Desktop Action open]
- Name=Open with VLC media player
--Exec=vlc cdda://
-+Exec=vlc cdda://%d
- Icon=vlc
- 
-diff --git a/share/solid/vlc-opendvd.desktop b/share/solid/vlc-opendvd.desktop
-index e86fa40..620a396 100644
---- a/share/solid/vlc-opendvd.desktop
-+++ b/share/solid/vlc-opendvd.desktop
-@@ -1,10 +1,10 @@
- [Desktop Entry]
--X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoDvd' ]
-+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]
- Type=Service
- Actions=open;
- 
- [Desktop Action open]
- Name=Open with VLC media player
--Exec=vlc dvd://
-+Exec=vlc dvd://%d
- Icon=vlc
- 
-diff --git a/share/solid/vlc-openvcd.desktop b/share/solid/vlc-openvcd.desktop
-index 4b75c7b..2965ea5 100644
---- a/share/solid/vlc-openvcd.desktop
-+++ b/share/solid/vlc-openvcd.desktop
-@@ -1,10 +1,10 @@
- [Desktop Entry]
--X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoCd|SuperVideoCd' ]
-+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'VideoCd|SuperVideoCd' ]
- Type=Service
- Actions=open;
- 
- [Desktop Action open]
- Name=Open with VLC media player
--Exec=vlc vcd://
-+Exec=vlc vcd://%d
- Icon=vlc
- 
--- 
-1.7.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 9b80c3c..495457d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 052_as-needed.diff
 200_osdmenu_paths.diff
-300_transcode_aspect_ratio.diff
-Fix-for-KDE-device-actions.patch

-- 
VLC media player packaging