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)
* commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404':
  rtmpproto: Ignore errors from the getStreamLength method

Conflicts:
libavformat/rtmpproto.c

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

Simple merge