diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
commit | 841a288cb32785400261cbab959fcfb982d3f699 (patch) | |
tree | 5cdac1ec2a527409495aadfb6d9142b89b398d8b /tests/fate/h264.mak | |
parent | a6e4796fbf0aa9b13451a8ef917ecc4e80d1d272 (diff) | |
parent | 4d3b144c5ea824193019019d33740a1ae9e0bb69 (diff) | |
download | ffmpeg-841a288cb32785400261cbab959fcfb982d3f699.tar.gz |
Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'
* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
fate: cosmetics: Order some test entries
Conflicts:
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/h264.mak')
0 files changed, 0 insertions, 0 deletions