diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 03:00:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 03:02:44 +0100 |
| commit | faa67e9777ebaece5d80456213a82d92b92e4101 (patch) | |
| tree | d8cb30cc1600e622c713b32e007f81b6956ab4aa | |
| parent | 98ba2887370e228a2b9303e8d8b6b32d8a211e0c (diff) | |
| parent | 796bd81835ebcb69d40bc87b33f13924a5937a1b (diff) | |
| download | ffmpeg-faa67e9777ebaece5d80456213a82d92b92e4101.tar.gz | |
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@gmx.at>
0 files changed, 0 insertions, 0 deletions