Changeset b8e44118 in ffmpeg

Timestamp:

Oct 4, 2013, 12:18:32 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5bb3ef3b

Parents:

205b6021 (diff), 24fee953 (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> (10/04/13 12:18:22)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/04/13 12:18:32)

Message:

Merge commit '24fee95321c1463360ba7042d026dae021854360'

• commit '24fee95321c1463360ba7042d026dae021854360': rtmpproto: Move the flv header/trailer addition to append_flv_data

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

(No files)