Changeset 8e970a58 in ffmpeg

Timestamp:
Aug 3, 2013, 7:01:48 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a8e96383
Parents:
7cd13f6 (diff), 0d6fa397 (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.
Message:

Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'

Conflicts:

Changelog
libavformat/version.h

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

(No files)

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