[SCM] libav/ubuntu: Imported Debian patch 4:0.8.1-0ubuntu2

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 8b16503e71e67d49fdcbaff0a2e25e8d56eb8176
Author: Andres Mejia <amejia at debian.org>
Date:   Sun May 13 13:07:30 2012 -0400

    Imported Debian patch 4:0.8.1-0ubuntu2

diff --git a/debian/changelog b/debian/changelog
index e91629a..f380e7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libav (4:0.8.1-0ubuntu2) quantal; urgency=low
+
+  * Update warning to make clearer the deprecation of ffmpeg binary.
+    (LP: #939863)
+
+ -- Andres Mejia <amejia at debian.org>  Sun, 13 May 2012 13:07:30 -0400
+
 libav (4:0.8.1-0ubuntu1) precise; urgency=low
 
   * New upstream bug and security fix release (FFe: LP: #960949)
diff --git a/debian/patches/04-ffmpeg-warning-change.patch b/debian/patches/04-ffmpeg-warning-change.patch
new file mode 100644
index 0000000..bf06957
--- /dev/null
+++ b/debian/patches/04-ffmpeg-warning-change.patch
@@ -0,0 +1,21 @@
+Description: Make warning about deprecation of ffmpeg clearer.
+Author: Andres Mejia <amejia at debian.org>
+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 8e1e269..66758ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-Tweak-doxygen-config.patch
 03-disable-configuration-warnings.patch
+04-ffmpeg-warning-change.patch

-- 
Libav/FFmpeg packaging