Changeset 2cf52171 in ffmpeg

Timestamp:
Feb 23, 2015, 11:19:26 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
c3d40e30
Parents:
c0f02b22 (diff), 35c6ce76 (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> (02/23/15 11:03:29)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/23/15 11:19:26)
Message:

Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'

Conflicts:

Changelog
libavcodec/avcodec.h
libavcodec/version.h
tests/fate/video.mak

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.