Merge remote-tracking branch 'qatar/master' n0.12-dev
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 May 2012 18:48:50 +0000 (20:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 May 2012 19:06:14 +0000 (21:06 +0200)
commitc0b47d1914a19abacdf1edf081cbf07485952920
tree94b26fadd3ecf4352ff87bd807ea6124bc2f4c02
parente02e58fb1c108dd96ef5b61454a2ba8d2af895ea
parented7bdd8647a3d0f534c2af0d244fc8744ff262a0
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.
  imc: some cosmetics
  rtmp: Pass the proper return code in rtmp_handshake
  rtmp: Check return codes of net IO operations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/imc.c
libavformat/movenc.c
libavformat/rtmppkt.c
libavformat/rtmpproto.c