Changeset 04894ef3 in ffmpeg

Timestamp:

Nov 1, 2013, 6:34:19 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1295377f

Parents:

5a7a56d7 (diff), 9ceed7af (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 '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'

• commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05': rtpenc: Add a rtpflag option for sending BYE packets when finishing

Conflicts:

libavformat/version.h

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

(No files)