aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-08-20 10:50:33 -0700
committerDiego Biurrun <diego@biurrun.de>2014-09-04 16:14:54 -0700
commit554fd5cd630073b8273aa044a6bdfd6f608209e9 (patch)
treeb1169431ed87b1bb139b0e455b032764061d7c3b
parent2deac60a387409dcbc7b37a8c30de89c7aeb58ac (diff)
downloadffmpeg-554fd5cd630073b8273aa044a6bdfd6f608209e9.tar.gz
ffmpeg: Clarify wording of ffmpeg --> avconv deprecation message
-rw-r--r--ffmpeg.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index f61de33a33..1069c3eff8 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);