diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 20:59:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 21:10:10 +0200 |
| commit | d7463c681363d6057601e705d0bf775738529841 (patch) | |
| tree | 5aaab61d15d220df649ead3e432c36f72219ab2a /libavcodec/amr.h | |
| parent | 32cf26cc6a0dc1425ed60b8ac99552fd858fab9b (diff) | |
| parent | fab9df63a3156ffe1f9490aafaea41e03ef60ddf (diff) | |
| download | ffmpeg-d7463c681363d6057601e705d0bf775738529841.tar.gz | |
Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'
* commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf':
dsputil: Split off global motion compensation bits into a separate context
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_altivec.h
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amr.h')
0 files changed, 0 insertions, 0 deletions