Changeset 42a095d0 in ffmpeg

Timestamp:

Nov 28, 2014, 10:57:33 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

900fff89

Parents:

a105c1f2 (diff), 3c3b8003 (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 '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352'

• commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352': rtmpproto: Simplify code for copying data into the output packet

Conflicts:

libavformat/rtmpproto.c

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

(No files)