[FFmpeg-cvslog] Merge commit '04d8af5f17961b9b7076b8c974e360feb08787c2'

Michael Niedermayer git at videolan.org
Tue Oct 21 21:56:38 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 21 21:43:42 2014 +0200| [2f74b8d0edbe20a12f30385b4354bf5cbb48c80e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f74b8d0edbe20a12f30385b4354bf5cbb48c80e
---





More information about the ffmpeg-cvslog mailing list