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>

diff --cc libavcodec/imc.c
Simple merge

diff --cc libavformat/movenc.c
index 752d52713ac2895427868b7cc4707bc55d2f40ef,fa6e95771e4c9db2fb923ec4285bf47ed3851187..aaf8152cf777a0cdc8e073ab40a7de90104339a8
--- 1/libavformat/movenc.c
--- 2/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@@ -679,8 -623,7 +679,8 @@@ static int mov_write_audio_tag(AVIOCont
          track->enc->codec_id == CODEC_ID_AMR_NB ||
          track->enc->codec_id == CODEC_ID_ALAC ||
          track->enc->codec_id == CODEC_ID_ADPCM_MS ||
 -        track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV))
 +        track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV ||
-         mov_pcm_le_gt16(track->enc->codec_id)))
++        (mov_pcm_le_gt16(track->enc->codec_id) && version==1)))
          mov_write_wave_tag(pb, track);
      else if(track->tag == MKTAG('m','p','4','a'))
          mov_write_esds_tag(pb, track);

diff --cc libavformat/rtmppkt.c
Simple merge

diff --cc libavformat/rtmpproto.c
Simple merge