Changeset 5313d60 in ffmpeg

Timestamp:

May 27, 2014, 10:28:08 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b5657516

Parents:

48a6916 (diff), 1d3eb0b5 (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/27/14 22:27:23)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/27/14 22:28:08)

Message:

Merge commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1'

• commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1': oggenc: Move ogg_write_pages up above ogg_write_header

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

(No files)