Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Aug 2013 08:41:46 +0000 (10:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Aug 2013 08:51:03 +0000 (10:51 +0200)
commitb37ff488b8aab2fe1245f1ba3130b1d881559794
tree916940e9d93bfa3116056dca38aba3b1a340403c
parentef13a005c41c353b03b29edf7a20d226747dac4e
parente743e7ae6ee7e535c4394bec6fe6650d2b0dbf65
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libavutil: Make avpriv_open a library-internal function on msvcrt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavdevice/Makefile
libavformat/Makefile
libavutil/internal.h