Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Nov 2013 22:39:23 +0000 (23:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Nov 2013 22:39:31 +0000 (23:39 +0100)
commit48f37664a8b5bc43fc3dad5784f32ea2267d38a9
tree68995eab17b6838013d1c74b13d2ef3debaf1ea9
parent175e689cc5defe74d243ca37bcd74b37447d8716
parent86f910806b2c303c43727d357a5b927e662bb3d1
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove #undefs for formerly forbidden system functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
compat/getopt.c
libavcodec/dct-test.c
libavcodec/dvbsubdec.c
libavcodec/dvdsubdec.c