Changeset 90e1fc8b in ffmpeg

Timestamp:
Oct 4, 2013, 9:49:01 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
f3968ab4
Parents:
1e678007 (diff), 47b6cfc2 (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> (10/04/13 09:45:25)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/04/13 09:49:01)
Message:

Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

Conflicts:

libavformat/Makefile

Changes to libavformat/Makefile are not merged as our build system for the examples
is different.

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

(No files)

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