[FFmpeg-cvslog] Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'
Michael Niedermayer
git at videolan.org
Wed Apr 29 04:22:48 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 04:11:21 2015 +0200| [f6c524a9399f854602975c7c83c377fc7a4c0d5e] | committer: Michael Niedermayer
Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'
* commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845':
h263: Convert function to macro
Conflicts:
libavcodec/h263.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6c524a9399f854602975c7c83c377fc7a4c0d5e
---
More information about the ffmpeg-cvslog
mailing list