[SCM] libav/master: drop patches applied upstream

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e14dc00d7a4e71deb09f4c89c86892562da02c4b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 29 17:28:15 2012 +0200

    drop patches applied upstream

diff --git a/debian/patches/02-fix-avpreset-extension.patch b/debian/patches/02-fix-avpreset-extension.patch
deleted file mode 100644
index bbecd45..0000000
--- a/debian/patches/02-fix-avpreset-extension.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Author: Reinhard Tartler <siretart at tauware.de>
-Subject: ffmpeg-0.8 expects wrong preset file extension (.ffpreset instead of .avpreset)
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660978
-
-diff --git a/cmdutils.c b/cmdutils.c
-index a489a0f..e96fa81 100644
---- a/cmdutils.c
-+++ b/cmdutils.c
-@@ -883,12 +883,12 @@ FILE *get_preset_file(char *filename, size_t filename_size,
-         for (i = 0; i < 3 && !f; i++) {
-             if (!base[i])
-                 continue;
--            snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i],
-+            snprintf(filename, filename_size, "%s%s/%s.avpreset", base[i],
-                      i != 1 ? "" : "/.avconv", preset_name);
-             f = fopen(filename, "r");
-             if (!f && codec_name) {
-                 snprintf(filename, filename_size,
--                         "%s%s/%s-%s.ffpreset",
-+                         "%s%s/%s-%s.avpreset",
-                          base[i], i != 1 ? "" : "/.avconv", codec_name,
-                          preset_name);
-                 f = fopen(filename, "r");
-diff --git a/cmdutils.h b/cmdutils.h
-index eb96645..c69bb02 100644
---- a/cmdutils.h
-+++ b/cmdutils.h
-@@ -345,11 +345,11 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts);
-  * Get a file corresponding to a preset file.
-  *
-  * If is_path is non-zero, look for the file in the path preset_name.
-- * Otherwise search for a file named arg.ffpreset in the directories
-+ * Otherwise search for a file named arg.avpreset in the directories
-  * $AVCONV_DATADIR (if set), $HOME/.avconv, and in the datadir defined
-  * at configuration time, in that order. If no such file is found and
-  * codec_name is defined, then search for a file named
-- * codec_name-preset_name.ffpreset in the above-mentioned directories.
-+ * codec_name-preset_name.avpreset in the above-mentioned directories.
-  *
-  * @param filename buffer where the name of the found filename is written
-  * @param filename_size size in bytes of the filename buffer
-diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
-index 968d4f6..0e0c646 100644
---- a/doc/ffmpeg.texi
-+++ b/doc/ffmpeg.texi
-@@ -805,18 +805,18 @@ The argument passed to the @code{vpre}, @code{apre}, and @code{spre}
- preset options identifies the preset file to use according to the
- following rules:
- 
--First ffmpeg searches for a file named @var{arg}.ffpreset in the
-+First ffmpeg searches for a file named @var{arg}.avpreset in the
- directories @file{$AVCONV_DATADIR} (if set), and @file{$HOME/.avconv}, and in
- the datadir defined at configuration time (usually @file{PREFIX/share/avconv})
- in that order. For example, if the argument is @code{libx264-max}, it will
--search for the file @file{libx264-max.ffpreset}.
-+search for the file @file{libx264-max.avpreset}.
- 
- If no such file is found, then ffmpeg will search for a file named
-- at var{codec_name}- at var{arg}.ffpreset in the above-mentioned
-+ at var{codec_name}- at var{arg}.avpreset in the above-mentioned
- directories, where @var{codec_name} is the name of the codec to which
- the preset file options will be applied. For example, if you select
- the video codec with @code{-vcodec libx264} and use @code{-vpre max},
--then it will search for the file @file{libx264-max.ffpreset}.
-+then it will search for the file @file{libx264-max.avpreset}.
- @c man end
- 
- @chapter Tips
diff --git a/debian/patches/04-ffmpeg-warning-change.patch b/debian/patches/04-ffmpeg-warning-change.patch
deleted file mode 100644
index 0472d45..0000000
--- a/debian/patches/04-ffmpeg-warning-change.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Make warning about deprecation of ffmpeg clearer.
-Origin: Debian
-Forwarded: not-needed
-
---- a/ffmpeg.c
-+++ b/ffmpeg.c
-@@ -4376,9 +4376,10 @@
- 
-     show_banner();
- 
--    av_log(NULL, AV_LOG_WARNING, "This program is not developed anymore and is only "
--                                 "provided for compatibility. Use avconv instead "
--                                 "(see Changelog for the list of incompatible changes).\n");
-+    av_log(NULL, AV_LOG_WARNING, "*** THIS PROGRAM IS DEPRECATED ***\n"
-+                                 "This program is only provided for compatibility "
-+                                 "and will be removed in a future release. Please "
-+                                 "use avconv instead.\n");
- 
-     /* parse options */
-     parse_options(NULL, argc, argv, options, opt_output_file);
diff --git a/debian/patches/series b/debian/patches/series
index 7a58210..8e1e269 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 01-Tweak-doxygen-config.patch
-02-fix-avpreset-extension.patch
 03-disable-configuration-warnings.patch
-04-ffmpeg-warning-change.patch

-- 
Libav/FFmpeg packaging