Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Nov 2013 15:02:09 +0000 (16:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Nov 2013 15:02:50 +0000 (16:02 +0100)
* qatar/master:
  rtmphttp: Check for both 0 and AVERROR_EOF

Conflicts:
libavformat/rtmphttp.c

See: d04b7de786780747878c080ba522405c6f542ccb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtmphttp.c

Simple merge