diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-10 22:50:57 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-10 22:51:04 +0200 |
commit | fc94b68eb53f02c596f7e9bc129162fe280e9008 (patch) | |
tree | 2d8af2f142cd2bbf2267f7c83d774aa100eedf12 /libavformat/mpegenc.c | |
parent | b2cf655d6e3d8446fd2ce0197aede831e941f0e8 (diff) | |
parent | 72fbc9685c08baae7ab9996642707eaab873b6f1 (diff) | |
download | ffmpeg-fc94b68eb53f02c596f7e9bc129162fe280e9008.tar.gz |
Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'
* commit '72fbc9685c08baae7ab9996642707eaab873b6f1':
avconv: use current syntax for the scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegenc.c')
0 files changed, 0 insertions, 0 deletions