summaryrefslogtreecommitdiff
path: root/libavcodec/metasound_data.c
Commit message (Collapse)AuthorAge
* avcodec/metasound_data: remove unused variable lsp16sMartin Vignali2015-03-20
| | | | | | the table was duplicated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '56d061ce9da954560892e3551513d5ecc0439846'Michael Niedermayer2013-11-26
|\ | | | | | | | | | | | | | | | | | | | | * 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-26
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | | | | | | | * 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-14
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | * commit 'ddb839e9286594ff7a862a956402106fca7055c9': metasound: add missing modes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * metasound: add missing modesKostya Shishkov2013-11-14
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/metasound_data: Fix inconsistency in tablesMichael Niedermayer2013-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes out of array read This issue can be reproduced with: Lucky.asf teuflisch.asf from http://samples.ffmpeg.org/A-codecs/VoxWare/ as well as other samples fcb16m has 320 elements but the code before the patch can address a table of 384 elements in its place. I dont know if theres some elements missing, or its maybe the wrong table, or if the parameters affecting the table size are wrong, or if theres something else wrong. if someone reading this has easy access to some reference. (binary with the tables in it, spec, whatever, please contact us) This solution fixes the inconsistency by padding the table with zeros, this variant was suggested by Vitor Sessak. And ensures that nothing currently working breaks. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'Michael Niedermayer2013-08-08
|/ | | | | | | | | | | | * commit '3e5898782dce60334ab294821ca00b19c648cf66': Voxware MetaSound decoder Conflicts: Changelog libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Voxware MetaSound decoderKostya Shishkov2013-08-08