Changeset f602e221 in ffmpeg

Timestamp:

Nov 29, 2013, 9:59:02 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

68c90fc0

Parents:

e2f63be0 (diff), 75bd07f7 (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> (11/29/13 21:58:09)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/29/13 21:59:02)

Message:

Merge commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea'

• commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea': mpeg4videoenc: write 0 instead of vol_sprite_usage

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

(No files)