mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-15 03:23:32 +02:00
Merge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad'
* commit '2b5c1efa1465d8646f8be525cace7a21404e40ad':
g2meet: check ff_set_dimensions return value
Conflicts:
libavcodec/g2meet.c
See: 3af9d8269e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
b697a3314e