Changeset 83e8650f in ffmpeg

Timestamp:
Jun 3, 2014, 4:19:21 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
8d4d12a4
Parents:
bcbd7dbc (diff), 896a5bff (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 '896a5bff64264f4d01ed98eacc97a67260c1e17e'

Conflicts:

configure
libavcodec/arm/vc1dsp_init_neon.c

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

(No files)

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