Merge commit '52ea29867070243385220a223d7512ea7d4ae2d2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 12:49:55 +0000 (14:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 12:51:24 +0000 (14:51 +0200)
* commit '52ea29867070243385220a223d7512ea7d4ae2d2':
  fate: use current syntax for the scale filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/filter-video.mak
tests/fate/h264.mak

Simple merge
Simple merge