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)
* qatar/master:
  Remove #undefs for formerly forbidden system functions

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

diff --cc compat/getopt.c
Simple merge
Simple merge
Simple merge
Simple merge