[FFmpeg-cvslog] Merge commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a'
Michael Niedermayer
git at videolan.org
Mon Jun 8 21:27:15 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 8 21:16:36 2015 +0200| [e05fda99f7a4e1e80479b4e9b4a92e33dd0c06be] | committer: Michael Niedermayer
Merge commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a'
* commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a':
mpegvideo: Rework frame_size_alloc function
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e05fda99f7a4e1e80479b4e9b4a92e33dd0c06be
---
More information about the ffmpeg-cvslog
mailing list