[FFmpeg-cvslog] Merge commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37'
Michael Niedermayer
git at videolan.org
Sun Jun 1 17:52:48 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 1 17:39:21 2014 +0200| [571effb3307dd41d67ce93e015aca2d3ae0d2841] | committer: Michael Niedermayer
Merge commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37'
* commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37':
Move Indeo4 frametypes into common header.
Conflicts:
libavcodec/ivi_common.c
See: d24673a2c80418c3c14dad523619f44f3ca8cb58
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=571effb3307dd41d67ce93e015aca2d3ae0d2841
---
More information about the ffmpeg-cvslog
mailing list