diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 14:07:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 14:13:16 +0100 |
| commit | c62cb1112ffc32492c99aa1e94324fc6a951abe9 (patch) | |
| tree | 4ed9a1feb6ea8db5b431487e6618d1015e84eb9a /libswscale/swscale.c | |
| parent | cf061a9c3b861a048dd5b67ded5265c6f53805e5 (diff) | |
| parent | fef906c77c09940a2fdad155b2adc05080e17eda (diff) | |
| download | ffmpeg-c62cb1112ffc32492c99aa1e94324fc6a951abe9.tar.gz | |
Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'
* commit 'fef906c77c09940a2fdad155b2adc05080e17eda':
Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale.c')
0 files changed, 0 insertions, 0 deletions