Changeset 4131a3cb in ffmpeg

Timestamp:

Sep 18, 2013, 10:09:06 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

015f7ce7

Parents:

46cc498 (diff), 8583b142 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (09/18/13 10:08:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/18/13 10:09:06)

Message:

Merge commit '8583b14252deac71136f1dec231910abab0ba503'

• commit '8583b14252deac71136f1dec231910abab0ba503': rtmp: Support reading interleaved chunks.

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)