Changeset 21ff626c in ffmpeg

Timestamp:

Nov 28, 2014, 11:31:59 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5ce070c1

Parents:

900fff89 (diff), 01eac895 (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> (11/28/14 11:28:15)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/28/14 11:31:59)

Message:

Merge commit '01eac895ab350027467ffbe7278740f89ae8be75'

• commit '01eac895ab350027467ffbe7278740f89ae8be75': rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess

Conflicts:

libavformat/rtmpproto.c

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

(No files)