oops - forgot grabbing case for audio/video input auto detect
Originally committed as revision 134 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									da115c8a3e
								
							
						
					
					
						commit
						e30a284687
					
				
							
								
								
									
										15
									
								
								ffmpeg.c
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								ffmpeg.c
									
									
									
									
									
								
							| @ -1941,12 +1941,15 @@ void opt_output_file(const char *filename) | |||||||
|         use_video = file_format->video_codec != CODEC_ID_NONE; |         use_video = file_format->video_codec != CODEC_ID_NONE; | ||||||
|         use_audio = file_format->audio_codec != CODEC_ID_NONE; |         use_audio = file_format->audio_codec != CODEC_ID_NONE; | ||||||
| 
 | 
 | ||||||
|         /* disable if no corresponding type found */ |         /* disable if no corresponding type found and at least one
 | ||||||
|         check_audio_video_inputs(&input_has_video, &input_has_audio); |            input file */ | ||||||
|         if (!input_has_video) |         if (nb_input_files > 0) { | ||||||
|             use_video = 0; |             check_audio_video_inputs(&input_has_video, &input_has_audio); | ||||||
|         if (!input_has_audio) |             if (!input_has_video) | ||||||
|             use_audio = 0; |                 use_video = 0; | ||||||
|  |             if (!input_has_audio) | ||||||
|  |                 use_audio = 0; | ||||||
|  |         } | ||||||
| 
 | 
 | ||||||
|         /* manual disable */ |         /* manual disable */ | ||||||
|         if (audio_disable) { |         if (audio_disable) { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user