ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Nov 5
10:17:07 2014 +0100| [513d57cc4d3355baf4fca46cb1d2e6a0d82ee82a] | committer:
Michael Niedermayer
Merge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404'
* commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404':
rtmpproto: Ignore errors from the getStreamLength method
Conflicts:
libavformat/rtmpproto.c
See: 09711545f5d256bd3ac77004d123dae36c5db8f9
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=513d57cc4d3355baf4fca46cb1d2e6a0d82ee82a
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
