[SCM] libav/master: Change ffmpeg warning so that it's clearer the program is deprecated (LP: #939863)

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

The following commit has been merged in the master branch:
commit 7c8ab32960f5411884711be7f572e3fade3dc940
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Thu Mar 29 12:46:57 2012 -0400

    Change ffmpeg warning so that it's clearer the program is deprecated (LP: #939863)

diff --git a/debian/patches/04-ffmpeg-warning-change.patch b/debian/patches/04-ffmpeg-warning-change.patch
new file mode 100644
index 0000000..0472d45
--- /dev/null
+++ b/debian/patches/04-ffmpeg-warning-change.patch
@@ -0,0 +1,20 @@
+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 c376f17..7a58210 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-Tweak-doxygen-config.patch
 02-fix-avpreset-extension.patch
 03-disable-configuration-warnings.patch
+04-ffmpeg-warning-change.patch

-- 
Libav/FFmpeg packaging