mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-27 02:41:54 +08:00 
			
		
		
		
	Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'
* commit '72fbc9685c08baae7ab9996642707eaab873b6f1': avconv: use current syntax for the scale filter Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
		| @@ -354,7 +354,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, | |||||||
|         char args[255]; |         char args[255]; | ||||||
|         AVFilterContext *filter; |         AVFilterContext *filter; | ||||||
|  |  | ||||||
|         snprintf(args, sizeof(args), "%d:%d:flags=0x%X", |         snprintf(args, sizeof(args), "%d:%d:0x%X", | ||||||
|                  codec->width, |                  codec->width, | ||||||
|                  codec->height, |                  codec->height, | ||||||
|                  (unsigned)ost->sws_flags); |                  (unsigned)ost->sws_flags); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Michael Niedermayer
					Michael Niedermayer