[FFmpeg-cvslog] Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'
Michael Niedermayer
git at videolan.org
Fri Mar 14 02:18:23 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 02:12:45 2014 +0100| [f3d3e3fa4e1033e27977b7fdcab4a22fba57fe98] | committer: Michael Niedermayer
Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'
* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f':
bfin: Use more sensible file names
Conflicts:
libavcodec/bfin/pixels.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3d3e3fa4e1033e27977b7fdcab4a22fba57fe98
---
More information about the ffmpeg-cvslog
mailing list