diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 14:31:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 14:46:10 +0200 |
| commit | fb61ed1e9fcac9163746ffe4a53c6aa2e284dde1 (patch) | |
| tree | d7c9178f29036721f671350e81d6181db3380824 /version.sh | |
| parent | 16509d3a286c55f9149c0a98e3d7200ed6d2ee16 (diff) | |
| parent | ac4b32df71bd932838043a4838b86d11e169707f (diff) | |
| download | ffmpeg-fb61ed1e9fcac9163746ffe4a53c6aa2e284dde1.tar.gz | |
Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
On2 VP7 decoder
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>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions