projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a26789c
12c8912
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 1 Sep 2012 12:09:32 +0000
(14:09 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 1 Sep 2012 12:09:32 +0000
(14:09 +0200)
* qatar/master:
crypto: Remove a stray double space
Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*
Conflicts:
libavfilter/vf_delogo.c
libavfilter/vf_lut.c
libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge