Changeset 9340ced4 in ffmpeg

Timestamp:

May 23, 2014, 7:13:46 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6da06ef6

Parents:

d062db7 (diff), 27d460fe (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> (05/23/14 19:13:39)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/23/14 19:13:46)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Refuse to mux H.264 with fourcc H264 into avi without startcode.

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

(No files)