summaryrefslogtreecommitdiffstats
path: root/libavcodec/twinvq.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-211-1/+1
|\ | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-041-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'Hendrik Leppkes2015-09-121-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b': lavc: Sanitize header inclusion guards Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Sanitize header inclusion guardsVittorio Giovara2015-09-121-1/+1
| | | | | | | | | | | | Fix typos, add missing comments, and remove stray lines. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b'Michael Niedermayer2015-02-201-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b': libavcodec: Don't use av_cold annotation in twinvq header file Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavcodec: Don't use av_cold annotation in twinvq header filePeter Meerwald2015-02-201-2/+2
| | | | | | | | | | Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/twinvq: Use avpriv_float_dsp_alloc()Michael Niedermayer2014-11-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '56d061ce9da954560892e3551513d5ecc0439846'Michael Niedermayer2013-11-261-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '56d061ce9da954560892e3551513d5ecc0439846': metasound: add last missing modes (8kHz @ 6kbps per channel) Conflicts: Changelog doc/general.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * metasound: add last missing modes (8kHz @ 6kbps per channel)Kostya Shishkov2013-11-261-0/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'Michael Niedermayer2013-11-141-1/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4': twinvq: support multiple frames per packet Conflicts: libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * twinvq: support multiple frames per packetKostya Shishkov2013-11-141-1/+4
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab'Michael Niedermayer2013-08-061-4/+4
|/ | | | | | | | | | | * commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab': twinvq: Split VQF-specific part from common TwinVQ decoder core Conflicts: libavcodec/Makefile libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* twinvq: Split VQF-specific part from common TwinVQ decoder coreKostya Shishkov2013-08-051-0/+198
Signed-off-by: Diego Biurrun <diego@biurrun.de>
OpenPOWER on IntegriCloud