Merge commit '11d704dc94c029058ac366f85951f6728638fb9c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 02:24:02 +0000 (03:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 02:29:19 +0000 (03:29 +0100)
commit7f2367fb9ec0fe4aad560ca97e8e1885b1ee0fd2
tree0ec19300e2fe471c0502ecedce0135d4a9bf3d88
parent402a411406854d20b3f3ab105185ccff7f6cd9ff
parent11d704dc94c029058ac366f85951f6728638fb9c
Merge commit '11d704dc94c029058ac366f85951f6728638fb9c'

* commit '11d704dc94c029058ac366f85951f6728638fb9c':
  fate: add framepack filter test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/filter-video.mak
tests/ref/fate/filter-framepack-frameseq