Changeset c70e647a in ffmpeg

Timestamp:

Sep 23, 2013, 9:40:15 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

eaa20afa

Parents:

eee8cb42 (diff), 58404738 (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/23/13 09:40:10)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/23/13 09:40:15)

Message:

Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'

• commit '5840473890440dbe0bd2cce530ebb3d93e187ae6': rtmp: Rewrite embedded flv handling

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

(No files)