Changeset 48183f14 in ffmpeg

Timestamp:

Mar 30, 2015, 10:48:04 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a105931d

Parents:

21ee6da7 (diff), 87f87ccf (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> (03/30/15 22:47:40)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/30/15 22:48:04)

Message:

Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'

• commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5': mjpeg: Use a more precise type for put_marker()

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

(No files)