Changeset ac26d7ea in ffmpeg

Timestamp:

Jun 10, 2014, 9:25:46 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2d99b404

Parents:

8d02a55b (diff), a736ae1e (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> (06/10/14 21:17:29)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/10/14 21:25:46)

Message:

Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'

• commit 'a736ae1e96b8718af0962106aa40df5f4b246b55': doc: Document mpegts muxrate

Conflicts:

doc/muxers.texi

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

(No files)