OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fde9c5e
ec9f044
)
Merge commit 'ec9f04423b82afa323e90f5b2c677be74302c1fd'
author
Matthieu Bouron
<matthieu.bouron@stupeflix.com>
Wed, 13 Jul 2016 15:39:47 +0000
(17:39 +0200)
committer
Matthieu Bouron
<matthieu.bouron@stupeflix.com>
Wed, 13 Jul 2016 15:40:56 +0000
(17:40 +0200)
* commit '
ec9f04423b82afa323e90f5b2c677be74302c1fd
':
ffv1: Error out on unsupported format
This commit is a noop, the feature is already present in FFmpeg.
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
Trivial merge