Merge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Nov 2014 09:17:07 +0000 (10:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Nov 2014 09:17:07 +0000 (10:17 +0100)
commit513d57cc4d3355baf4fca46cb1d2e6a0d82ee82a
treee9598c24312127f179b4eb0c0ec74ead47fa96c6
parent37425fcb04748cf3177113f1615447bf7b3cb7ba
parenta490391157dcf4dc6b65352ec3eea2781dd0a404
Merge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404'

* commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404':
  rtmpproto: Ignore errors from the getStreamLength method

Conflicts:
libavformat/rtmpproto.c

See: 09711545f5d256bd3ac77004d123dae36c5db8f9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtmpproto.c