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:
bfe0320
61b323c
)
Merge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 4 Mar 2014 12:26:48 +0000
(13:26 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 4 Mar 2014 12:26:48 +0000
(13:26 +0100)
* commit '
61b323ce7c7cdc101eadfd7de2203922b8a39e8d
':
vf_frei0r: refactor library loading from env variable
Conflicts:
configure
libavfilter/vf_frei0r.c
Not merged, we use av_strtok() which leads to simpler code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge