Merge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:31:14 +0000 (14:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:31:48 +0000 (14:31 +0100)
commitb697a3314e84b6f79062d0cdf5e72ff495d30b79
tree086ef75be3e04308b0b6fd6061a25189b0322a6b
parentdfa0800c414a66ceebf394bb6d4208cd68673e4c
parent2b5c1efa1465d8646f8be525cace7a21404e40ad
Merge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad'

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

Conflicts:
libavcodec/g2meet.c

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