Changeset 5a284d0 in ffmpeg

Timestamp:
Apr 20, 2015, 3:28:13 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
82d9c4e5
Parents:
fcca7671 (diff), 22526c1f (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 '22526c1f557a72b3285d295bd8b30c40eb65d437'

Conflicts:

Changelog
libavcodec/version.h

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

(No files)

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