[FFmpeg-cvslog] Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'
Michael Niedermayer
git at videolan.org
Fri Nov 1 15:00:49 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 1 14:50:02 2013 +0100| [e6b9d71ad9569b5d033058958da5155100ada1ab] | committer: Michael Niedermayer
Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'
* commit '3b086317277e3f3b61c0343930d8e2570b278bd6':
h26[13]dec: stop using deprecated avcodec_set_dimensions
gifdec: stop using deprecated avcodec_set_dimensions
g2meet: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/gifdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6b9d71ad9569b5d033058958da5155100ada1ab
---
More information about the ffmpeg-cvslog
mailing list