Changeset 2d99b404 in ffmpeg

Timestamp:

Jun 10, 2014, 9:27:16 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

723adfb1

Parents:

ac26d7ea (diff), 3f7e94ec (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 '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac'

• commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac': mpegts: Move the option section to the bottom

Conflicts:

libavformat/mpegtsenc.c

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

(No files)