Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Sep 2012 12:09:32 +0000 (14:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Sep 2012 12:09:32 +0000 (14:09 +0200)
commit899101d3d39d8165aa3c767efdb1d9c8a010d16d
treeaf8f68ff372f288f75b1104eb92e6194e35185ce
parenta26789cf9f8000a040a4f4481e0f3552cf63dc68
parent12c8912de2f2c1a235a7578d6a288e217c3fb504
Merge remote-tracking branch 'qatar/master'

* 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>