[FFmpeg-cvslog] Merge commit 'f7e85ee996b3886c2b13e928b83277382311af96'
Michael Niedermayer
git at videolan.org
Mon Jan 20 15:13:32 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 20 15:07:45 2014 +0100| [ea4b477a1b3c2c7cda8cb62a986691cdb7b1cac4] | committer: Michael Niedermayer
Merge commit 'f7e85ee996b3886c2b13e928b83277382311af96'
* commit 'f7e85ee996b3886c2b13e928b83277382311af96':
lavc: allow the caller to override dimensions in ff_get_buffer()
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea4b477a1b3c2c7cda8cb62a986691cdb7b1cac4
---
More information about the ffmpeg-cvslog
mailing list