Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 12:16:47 +0000 (13:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 12:16:55 +0000 (13:16 +0100)
* qatar/master:
  network.h: Add #endif comments to improve readability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/network.h

Simple merge