eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
1fddfaa282ff63dba4170ced30f96dbb48bd0246
ffmpeg/libavformat/rtmpproto.c
Michael Niedermayer 513d57cc4d Merge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404' 
* commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404':
  rtmpproto: Ignore errors from the getStreamLength method

Conflicts:
	libavformat/rtmpproto.c

See: 09711545f5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-05 10:17:07 +01:00

103 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink