Changeset ca0e6fa7 in ffmpeg

Timestamp:

Mar 17, 2014, 2:58:02 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

020baa0b

Parents:

1c79ca27 (diff), 6612a03d (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/17/14 14:56:49)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/17/14 14:58:02)

Message:

Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'

• commit '6612a03d7470af4aa6b8aa313b1eff013691d181': fraps: set color_range

Conflicts:

libavcodec/fraps.c

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

(No files)