[FFmpeg-cvslog] Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'
Michael Niedermayer
git at videolan.org
Fri Nov 1 13:15:27 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 1 13:07:15 2013 +0100| [7b91e9cf5dc7b46216aa4da79943aecf9425ab04] | committer: Michael Niedermayer
Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'
* commit '7644f5a80787c9b608b82873604805d7e38a6a18':
lavc: replace avcodec_set_dimensions with ff_set_dimensions
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b91e9cf5dc7b46216aa4da79943aecf9425ab04
---
More information about the ffmpeg-cvslog
mailing list