[FFmpeg-cvslog] Merge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213'
Michael Niedermayer
git at videolan.org
Fri Nov 1 13:27:43 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 1 13:21:14 2013 +0100| [66f436adf5a30b19d2730a884417f2a0fd5e0925] | committer: Michael Niedermayer
Merge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213'
* commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213':
lavc/utils: stop using deprecated avcodec_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=66f436adf5a30b19d2730a884417f2a0fd5e0925
---
More information about the ffmpeg-cvslog
mailing list