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:
2865c1b
e739969
)
Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 4 Nov 2013 20:52:46 +0000
(21:52 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 4 Nov 2013 20:52:46 +0000
(21:52 +0100)
* commit '
e73996954d8e00117056dcefb38ef3d4d2f37967
':
filtfmts-test: Fix use of deprecated API
Conflicts:
libavfilter/filtfmts.c
See:
f12174c8cef872030a156cbf252f4951c3a6357c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge