Changeset fb61ed1e in ffmpeg

Timestamp:
Apr 4, 2014, 12:46:10 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a20480e6
Parents:
16509d3a (diff), ac4b32df (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> (04/04/14 12:31:04)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/04/14 12:46:10)
Message:

Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'

Conflicts:

Changelog
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/vp8dsp.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/avcodec.h
libavcodec/h264pred.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/vp8dsp_init.c

See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)

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