Changeset 6e76e6a0 in ffmpeg

Timestamp:
Jun 30, 2013, 10:15:12 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
32a39552
Parents:
a285079b (diff), b545179f (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 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'

Conflicts:

libavutil/x86/lls.asm

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

(No files)

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