[FFmpeg-cvslog] Merge commit '796bd81835ebcb69d40bc87b33f13924a5937a1b' into release/2.4
Michael Niedermayer
git at videolan.org
Sun Jan 18 03:20:23 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 03:00:31 2015 +0100| [faa67e9777ebaece5d80456213a82d92b92e4101] | committer: Michael Niedermayer
Merge commit '796bd81835ebcb69d40bc87b33f13924a5937a1b' into release/2.4
* commit '796bd81835ebcb69d40bc87b33f13924a5937a1b':
g2meet: check ff_set_dimensions return value
Conflicts:
libavcodec/g2meet.c
See: 3af9d8269ea2878fb7960ab5ed52f4a75c73e6ec
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=faa67e9777ebaece5d80456213a82d92b92e4101
---
More information about the ffmpeg-cvslog
mailing list