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>
This commit is contained in:
commit
2f74b8d0ed