Changeset 1295377f in ffmpeg

Timestamp:

Nov 1, 2013, 6:40:20 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8b3964ec

Parents:

04894ef3 (diff), 50aef03b (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/01/13 18:40:08)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/01/13 18:40:20)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: rtspenc: Make sure BYE packets are sent before TEARDOWN

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

(No files)