[FFmpeg-cvslog] Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'
Michael Niedermayer
git at videolan.org
Thu Apr 25 10:04:51 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 25 09:54:11 2013 +0200| [575399c7e11611b4cbf30a61e0e8e92f12893896] | committer: Michael Niedermayer
Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'
* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
fate: add CVFC1_Sony_C to h264 conformance tests
doc/APIchanges: add missing hashes and dates
Conflicts:
doc/APIchanges
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=575399c7e11611b4cbf30a61e0e8e92f12893896
---
More information about the ffmpeg-cvslog
mailing list