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:
54bb30b
344d6db
)
Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 29 Dec 2013 02:00:38 +0000
(
03:00
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 29 Dec 2013 02:16:09 +0000
(
03:16
+0100)
* 'master' of https://github.com/upsuper/ffmpeg-vdadec:
avcodec/vda_h264_dec: add format check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge