projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dfa0800
2b5c1ef
)
Merge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 13 Nov 2014 13:31:14 +0000
(14:31 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 13 Nov 2014 13:31:48 +0000
(14:31 +0100)
* commit '
2b5c1efa1465d8646f8be525cace7a21404e40ad
':
g2meet: check ff_set_dimensions return value
Conflicts:
libavcodec/g2meet.c
See:
3af9d8269ea2878fb7960ab5ed52f4a75c73e6ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge