Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Jun 2012 20:28:28 +0000 (22:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Jun 2012 20:28:28 +0000 (22:28 +0200)
commit6ca48ad044e690c43985aa380cb474f1a3df7b4e
tree47a311223209a8edd05242cf417d6b6c61bd83b6
parent54101214d89382a24518f21a30080631a981c798
parent5f26d4d44896542e729c7515c784d983e396106a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  amr: Cosmetic cleanup
  mov_chan: Fix operator precedence by adding parentheses
  doc: Add missing protocols to list of supported protocols.
  tcp: Check the listen call

Conflicts:
libavformat/amr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/general.texi
libavformat/amr.c
libavformat/tcp.c