[SCM] libav/wheezy-security: ffmpeg: Clarify wording of ffmpeg --> avconv deprecation message

[siretart at users.alioth.debian.org]

The following commit has been merged in the wheezy-security branch:
commit 554fd5cd630073b8273aa044a6bdfd6f608209e9
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Aug 20 10:50:33 2014 -0700

    ffmpeg: Clarify wording of ffmpeg --> avconv deprecation message

diff --git a/ffmpeg.c b/ffmpeg.c
index f61de33..1069c3e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4376,9 +4376,11 @@ int main(int argc, char **argv)
 
     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,
+           "The ffmpeg program is only provided for script compatibility and will be removed\n"
+           "in a future release. It has been deprecated in the Libav project to allow for\n"
+           "incompatible command line syntax improvements in its replacement called avconv\n"
+           "(see Changelog for details). Please use avconv instead.\n");
 
     /* parse options */
     parse_options(NULL, argc, argv, options, opt_output_file);

-- 
Libav/FFmpeg packaging