Changeset 513d57cc in ffmpeg

Timestamp:

Nov 5, 2014, 9:17:07 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

07c3a4f6

Parents:

37425fc (diff), a4903911 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)