You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	ff*: Fix duplicatedly printed version info with -version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
		
							
								
								
									
										2
									
								
								avconv.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								avconv.c
									
									
									
									
									
								
							| @@ -4392,7 +4392,7 @@ int main(int argc, char **argv) | ||||
|     av_register_all(); | ||||
|     avformat_network_init(); | ||||
|  | ||||
|     show_banner(); | ||||
|     show_banner(argc, argv, options); | ||||
|  | ||||
|     /* parse options */ | ||||
|     parse_options(&o, argc, argv, options, opt_output_file); | ||||
|   | ||||
| @@ -582,8 +582,12 @@ static void print_all_libs_info(int flags, int level) | ||||
|     PRINT_LIB_INFO(postproc, POSTPROC, flags, level); | ||||
| } | ||||
|  | ||||
| void show_banner(void) | ||||
| void show_banner(int argc, char **argv, const OptionDef *options) | ||||
| { | ||||
|     int idx = locate_option(argc, argv, options, "version"); | ||||
|     if (idx) | ||||
|         return; | ||||
|  | ||||
|     av_log(NULL, AV_LOG_INFO, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n", | ||||
|            program_name, program_birth_year, this_year); | ||||
|     av_log(NULL, AV_LOG_INFO, "  built on %s %s with %s %s\n", | ||||
|   | ||||
| @@ -245,7 +245,7 @@ void print_error(const char *filename, int err); | ||||
|  * current version of the repository and of the libav* libraries used by | ||||
|  * the program. | ||||
|  */ | ||||
| void show_banner(void); | ||||
| void show_banner(int argc, char **argv, const OptionDef *options); | ||||
|  | ||||
| /** | ||||
|  * Print the version of the program to stdout. The version message | ||||
|   | ||||
							
								
								
									
										2
									
								
								ffmpeg.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								ffmpeg.c
									
									
									
									
									
								
							| @@ -4857,7 +4857,7 @@ int main(int argc, char **argv) | ||||
|     av_register_all(); | ||||
|     avformat_network_init(); | ||||
|  | ||||
|     show_banner(); | ||||
|     show_banner(argc, argv, options); | ||||
|  | ||||
|     term_init(); | ||||
|  | ||||
|   | ||||
							
								
								
									
										2
									
								
								ffplay.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								ffplay.c
									
									
									
									
									
								
							| @@ -3165,7 +3165,7 @@ int main(int argc, char **argv) | ||||
|  | ||||
|     init_opts(); | ||||
|  | ||||
|     show_banner(); | ||||
|     show_banner(argc, argv, options); | ||||
|  | ||||
|     parse_options(NULL, argc, argv, options, opt_input_file); | ||||
|  | ||||
|   | ||||
| @@ -1252,7 +1252,7 @@ int main(int argc, char **argv) | ||||
|     avdevice_register_all(); | ||||
| #endif | ||||
|  | ||||
|     show_banner(); | ||||
|     show_banner(argc, argv, options); | ||||
|     parse_options(NULL, argc, argv, options, opt_input_file); | ||||
|  | ||||
|     if (!input_filename) { | ||||
|   | ||||
| @@ -4673,7 +4673,7 @@ int main(int argc, char **argv) | ||||
|     av_register_all(); | ||||
|     avformat_network_init(); | ||||
|  | ||||
|     show_banner(); | ||||
|     show_banner(argc, argv, options); | ||||
|  | ||||
|     my_program_name = argv[0]; | ||||
|     my_program_dir = getcwd(0, 0); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user