diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 14:31:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 14:31:48 +0100 |
| commit | b697a3314e84b6f79062d0cdf5e72ff495d30b79 (patch) | |
| tree | 086ef75be3e04308b0b6fd6061a25189b0322a6b /libavcodec/avs.c | |
| parent | dfa0800c414a66ceebf394bb6d4208cd68673e4c (diff) | |
| parent | 2b5c1efa1465d8646f8be525cace7a21404e40ad (diff) | |
| download | ffmpeg-b697a3314e84b6f79062d0cdf5e72ff495d30b79.tar.gz | |
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>
Diffstat (limited to 'libavcodec/avs.c')
0 files changed, 0 insertions, 0 deletions