Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 May 2013 20:50:57 +0000 (22:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 May 2013 20:51:04 +0000 (22:51 +0200)
commitfc94b68eb53f02c596f7e9bc129162fe280e9008
tree2d8af2f142cd2bbf2267f7c83d774aa100eedf12
parentb2cf655d6e3d8446fd2ce0197aede831e941f0e8
parent72fbc9685c08baae7ab9996642707eaab873b6f1
Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'

* commit '72fbc9685c08baae7ab9996642707eaab873b6f1':
  avconv: use current syntax for the scale filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_filter.c