update for 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Add x264 and fdk-aac codecs.
Merge branch 'temp'