Upgrading to GitLab 11.10.0. Expect errors and see debian-infrastructure-announce@lists.debian.org for further information.

Commit fead4838 authored by Bas Zoetekouw's avatar Bas Zoetekouw

Remove obsolete patch

parent 70f0010d
Last-Update: 2015-03-25
Forwarded: no
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: use avconv instead of ffmpeg
--- a/iowatcher/README
+++ b/iowatcher/README
@@ -15,9 +15,9 @@
rsvg-convert can turn the svgs into many other formats.
Building:
- Type make and make install. We need ffmpeg or png2theora, and
+ Type make and make install. We need avconv or png2theora, and
librsvg to make movies, otherwise there are no dependencies.
The basic options:
@@ -42,9 +42,9 @@
-m Create a movie. The file format depends on the extension used in the
-o filename.* option. If you specify an .ogv or .ogg extension, the
result will be Ogg Theora video, if png2theora is available.
If you use an .mp4 extension, the result will be an mp4 video if
- ffmpeg is avilable. You can use any other extension, but the end
+ avconv is avilable. You can use any other extension, but the end
result will be an mp4.
You can use --movie=spindle or --movie=rect, which changes the
style of the IO mapping.
--- a/iowatcher/iowatcher.1
+++ b/iowatcher/iowatcher.1
@@ -7,9 +7,9 @@
.B iowatcher
\fI[options]\fR [--] \fI[program arguments ...]\fR
.SH DESCRIPTION
-iowatcher graphs the results of a blktrace run. It can graph the result of an existing blktrace, start a new blktrace, or start a new blktrace and a benchmark run. It can then create an image or movie of the IO from a given trace. iowatcher can produce either SVG files or movies in mp4 format (with ffmpeg) or ogg format (with png2theora).
+iowatcher graphs the results of a blktrace run. It can graph the result of an existing blktrace, start a new blktrace, or start a new blktrace and a benchmark run. It can then create an image or movie of the IO from a given trace. iowatcher can produce either SVG files or movies in mp4 format (with avconv) or ogg format (with png2theora).
.SH OPTIONS
.TP
\fB--help\fP
@@ -50,9 +50,9 @@
\fB-m, --movie\fP \fI[style]\fP
Create a movie. The file format depends on the extension used in the \fB-o\fP
\fIfile\fP option. If you specify an .ogv or .ogg extension, the result will
be Ogg Theora video, if png2theora is available. If you use an .mp4 extension,
-the result will be an mp4 video if ffmpeg is available. You can use any other
+the result will be an mp4 video if avconv is available. You can use any other
extension, but the end result will be an mp4. The accepted \fIstyle\fP values
are \fBspindle\fP for a circular disc-like effect (default) or \fBrect\fP for a
rectangular graph style.
.TP
--- a/iowatcher/main.c
+++ b/iowatcher/main.c
@@ -1025,10 +1025,10 @@
}
static void mencode_movie(char *movie_dir)
{
- fprintf(stderr, "Creating movie %s with ffmpeg\n", movie_dir);
- snprintf(line, line_len, "ffmpeg -r 20 -y -i %s/%%10d-%s.svg.png -b:v 250k "
+ fprintf(stderr, "Creating movie %s with avconv\n", movie_dir);
+ snprintf(line, line_len, "avconv -r 20 -y -i %s/%%10d-%s.svg.png -b:v 250k "
"-vcodec %s %s", movie_dir, output_filename, ffmpeg_codec,
output_filename);
system(line);
}
@@ -1331,9 +1331,9 @@
"\t-o (--output): output file name for the SVG image or video\n"
"\t-p (--prog): run a program while blktrace is run\n"
"\t-K (--keep-movie-svgs keep svgs generated for movie mode\n"
"\t-m (--movie [=spindle|rect]): create IO animations\n"
- "\t-C (--codec): ffmpeg codec. Use ffmpeg -codecs to list\n"
+ "\t-C (--codec): avconv codec. Use avconv -codecs to list\n"
"\t-r (--rolling): number of seconds in the rolling averge\n"
"\t-T (--title): graph title\n"
"\t-N (--no-graph): skip a single graph (io, tput, latency, queue_depth, \n"
"\t\t\tiops, cpu-sys, cpu-io, cpu-irq cpu-soft cpu-user)\n"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment