Changeset 31d0d355 in ffmpeg

Timestamp:

Oct 9, 2013, 12:29:42 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

19fda0a

Parents:

4ce82e6f (diff), ad7d7d4f (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> (10/09/13 12:27:00)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/09/13 12:29:42)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: x86inc: Remove .rodata kludges

Conflicts:

libavutil/x86/x86inc.asm

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

(No files)