diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-08 00:54:55 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-08 00:54:55 +0200 |
commit | f044fc03727dcbe7535b393e06d8ab1bc0312a9c (patch) | |
tree | a45d030361c42e9c650f4c2544f6307625ad04ec /libavcodec/g726.c | |
parent | 1a59a288380ab208914c5e8d94f688a6f75954ae (diff) | |
parent | 1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d (diff) | |
download | ffmpeg-f044fc03727dcbe7535b393e06d8ab1bc0312a9c.tar.gz |
Merge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'
* commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d':
Split off floating point AAN (I)DCT into separate components
Conflicts:
configure
libavcodec/Makefile
libavcodec/dct-test.c
libavcodec/idctdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g726.c')
0 files changed, 0 insertions, 0 deletions