ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to