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)
commit77274d5c79a1cf74f1bd9773c1beda554dc90cb2
tree9c3c42645e0b13c7fcde54e2a5bacfd670443318
parent99b6357f37b733cc2b6a7604efaaa5803be04017
parent9997cee04d6adfa301e2495428c4d664fa4ad0ad
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  network.h: Add #endif comments to improve readability

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