Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jul 2013 09:26:28 +0000 (11:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jul 2013 09:26:28 +0000 (11:26 +0200)
commit7bd417c22a90a712df57cacfa5b09c1fb4f6183a
tree791ce856605d50cc601bb892ec9ff0b073a73353
parent2adf8a9c09c9d00c4b34c062206cefad489f9ba9
parent6516632967da5e6bd7d6136e8678f826669ed26e
Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'

* commit '6516632967da5e6bd7d6136e8678f826669ed26e':
  tests: Only run noproxy test if networking is enabled
  fifo: K&R formatting cosmetics

Conflicts:
libavformat/Makefile
libavutil/fifo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile
libavutil/fifo.c