Changeset 8be0e2bd in ffmpeg

Timestamp:

Aug 30, 2013, 10:08:28 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c1913064

Parents:

f0a35623 (diff), 6369ba3c (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 '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'

• commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0': x86: avcodec: Use convenience macros to check for CPU flags

Conflicts:

libavcodec/x86/dsputil_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c

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

(No files)