Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 12:09:06 +0000 (13:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 12:09:06 +0000 (13:09 +0100)
commit7011aab5018a71d84ff00b375b94a5bb71b44937
tree22911002011a8d0c59fd62770079f56d77b45022
parent2fb0027c267dfaa1d6d1f16ebd735c00f99c0d8a
parente1f2987b10112489f6da5501d4c8735a798c9e3f
Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'

* commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f':
  FATE: add tests for the shuffleplanes filter

Conflicts:
tests/fate/filter-video.mak

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