Changeset d1e2d59 in ffmpeg

Timestamp:

Feb 25, 2015, 4:49:36 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

63ca0fe8

Parents:

205b2ba3 (diff), 56ffde3f (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/25/15 16:49:33)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/25/15 16:49:36)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Allow muxing h264 into ts with startcode "001" instead of "0001". lavfi/fade: Do not overread input buffer.

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

(No files)