Changeset f4c8d002 in ffmpeg

Timestamp:
Feb 20, 2014, 12:50:26 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
6a24d779
Parents:
ca9f7e18 (diff), 6bb8720 (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 '6bb8720f00e2e6209665f819fb351fd42b82d5d0'

Conflicts:

doc/APIchanges
libavutil/version.h

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

(No files)

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