| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-10 20:50:57 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-10 20:51:04 (GMT) |
| commit | fc94b68eb53f02c596f7e9bc129162fe280e9008 (patch) | |
| tree | 2d8af2f142cd2bbf2267f7c83d774aa100eedf12 | |
| parent | b2cf655d6e3d8446fd2ce0197aede831e941f0e8 (diff) | |
| parent | 72fbc9685c08baae7ab9996642707eaab873b6f1 (diff) | |
| download | ffmpeg-fc94b68eb53f02c596f7e9bc129162fe280e9008.zip ffmpeg-fc94b68eb53f02c596f7e9bc129162fe280e9008.tar.gz ffmpeg-fc94b68eb53f02c596f7e9bc129162fe280e9008.tar.bz2 | |
Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'
* commit '72fbc9685c08baae7ab9996642707eaab873b6f1':
avconv: use current syntax for the scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 4b5c676..ed4c9b1 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -354,7 +354,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, char args[255]; AVFilterContext *filter; - snprintf(args, sizeof(args), "%d:%d:flags=0x%X", + snprintf(args, sizeof(args), "%d:%d:0x%X", codec->width, codec->height, (unsigned)ost->sws_flags); |