Changeset 83f18410 in ffmpeg

Timestamp:

Feb 23, 2015, 8:43:18 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9ad8f55e

Parents:

cce8f750 (diff), cdcc370 (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> (02/23/15 20:39:29)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/23/15 20:43:18)

Message:

Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d'

• commit 'cdcc370293a159c321e41af7f0eef141c62d698d': rtsp: punch holes again after pause

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

(No files)