Commit b697a331 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '2b5c1efa'

* commit '2b5c1efa':
  g2meet: check ff_set_dimensions return value

Conflicts:
	libavcodec/g2meet.c

See: 3af9d826Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents dfa0800c 2b5c1efa
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment