Changeset de17ccc7 in ffmpeg

Timestamp:
Jan 31, 2014, 1:30:30 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
8eaa6621
Parents:
a85a718f (diff), 51daafb0 (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> (01/31/14 13:29:48)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/31/14 13:30:30)
Message:

Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2'

Conflicts:

libavcodec/x86/videodsp_init.c

See: 1b3a7e1f42c3d89253e9837ada98e6bfb0cbab2f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

(No files)

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