diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 13:09:06 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 13:09:06 +0100 |
commit | 7011aab5018a71d84ff00b375b94a5bb71b44937 (patch) | |
tree | 22911002011a8d0c59fd62770079f56d77b45022 /libavdevice | |
parent | 2fb0027c267dfaa1d6d1f16ebd735c00f99c0d8a (diff) | |
parent | e1f2987b10112489f6da5501d4c8735a798c9e3f (diff) | |
download | ffmpeg-7011aab5018a71d84ff00b375b94a5bb71b44937.tar.gz |
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>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions