[FFmpeg-cvslog] Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'
Michael Niedermayer
git at videolan.org
Wed May 29 04:08:32 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 29 04:02:23 2013 +0200| [e755c8ac462e85e6c3de4f0207dc6bb5c86409cf] | committer: Michael Niedermayer
Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'
* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade':
fate: Don't use files from SRC_PATH in the actual tests
indeo4: reuse context block VLC for band instead of defaulting
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e755c8ac462e85e6c3de4f0207dc6bb5c86409cf
---
More information about the ffmpeg-cvslog
mailing list