From 3aace1bcac084e1a2cc6ba107b6d987feb1b69b3 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Mon, 26 Jul 2010 13:39:41 +0000 Subject: [PATCH] Rename av_transcode() to transcode(). av_ prefix is reserved for libav* libraries functions, it is confusing to use it for an application function. Originally committed as revision 24505 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 6625c58153..00ef74474b 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1938,7 +1938,7 @@ static int copy_chapters(int infile, int outfile) /* * The following code is the main loop of the file converter */ -static int av_transcode(AVFormatContext **output_files, +static int transcode(AVFormatContext **output_files, int nb_output_files, AVFormatContext **input_files, int nb_input_files, @@ -4354,7 +4354,7 @@ int main(int argc, char **argv) } ti = getutime(); - if (av_transcode(output_files, nb_output_files, input_files, nb_input_files, + if (transcode(output_files, nb_output_files, input_files, nb_input_files, stream_maps, nb_stream_maps) < 0) ffmpeg_exit(1); ti = getutime() - ti;