diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-21 21:43:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-21 21:44:48 +0200 |
| commit | 2f74b8d0edbe20a12f30385b4354bf5cbb48c80e (patch) | |
| tree | cb5152b562e5358ffcbece243f867dde0500fce4 /tests/ref/fate/fraps-v2 | |
| parent | d5a3a20d1e19e819b4f4e17831c30d236407c334 (diff) | |
| parent | 04d8af5f17961b9b7076b8c974e360feb08787c2 (diff) | |
| download | ffmpeg-2f74b8d0edbe20a12f30385b4354bf5cbb48c80e.tar.gz | |
Merge commit '04d8af5f17961b9b7076b8c974e360feb08787c2'
* commit '04d8af5f17961b9b7076b8c974e360feb08787c2':
fate-mpeg4: use TARGET_SAMPLES for resize tests
Conflicts:
tests/fate/mpeg4.mak
See: c40a1bd253f673d821a5df2a7a863a1837446123
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/fraps-v2')
0 files changed, 0 insertions, 0 deletions