Merge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad'

Browse Source

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

Conflicts:
	libavcodec/g2meet.c

See: 3af9d8269e
Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/97/head

Michael Niedermayer 10 years ago

parent dfa0800c41 2b5c1efa14

commit b697a3314e

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available