[FFmpeg-cvslog] Merge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad'
Michael Niedermayer
git at videolan.org
Thu Nov 13 14:45:58 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 14:31:14 2014 +0100| [b697a3314e84b6f79062d0cdf5e72ff495d30b79] | committer: Michael Niedermayer
Merge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad'
* commit '2b5c1efa1465d8646f8be525cace7a21404e40ad':
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=b697a3314e84b6f79062d0cdf5e72ff495d30b79
---
More information about the ffmpeg-cvslog
mailing list