Merge commit '04d8af5f17961b9b7076b8c974e360feb08787c2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 19:43:42 +0000 (21:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 19:44:48 +0000 (21:44 +0200)
commit2f74b8d0edbe20a12f30385b4354bf5cbb48c80e
treecb5152b562e5358ffcbece243f867dde0500fce4
parentd5a3a20d1e19e819b4f4e17831c30d236407c334
parent04d8af5f17961b9b7076b8c974e360feb08787c2
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>