Michael Niedermayer
ac021fdc40
Merge commit '56d061ce9da954560892e3551513d5ecc0439846'
...
* commit '56d061ce9da954560892e3551513d5ecc0439846':
metasound: add last missing modes (8kHz @ 6kbps per channel)
Conflicts:
Changelog
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26 12:28:31 +01:00
Kostya Shishkov
56d061ce9d
metasound: add last missing modes (8kHz @ 6kbps per channel)
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-26 08:29:42 +01:00
Michael Niedermayer
a24aef5dfa
Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'
...
* commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4':
twinvq: support multiple frames per packet
Conflicts:
libavcodec/twinvq.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14 15:42:05 +01:00
Michael Niedermayer
2cfdc2879a
Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'
...
* commit 'ddb839e9286594ff7a862a956402106fca7055c9':
metasound: add missing modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14 15:31:34 +01:00
Kostya Shishkov
1afa8a7568
twinvq: support multiple frames per packet
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-14 13:38:10 +01:00
Kostya Shishkov
ddb839e928
metasound: add missing modes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-14 13:38:10 +01:00
Michael Niedermayer
ac4447b6ec
Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'
...
* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
metasound: Fix error message argument
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-08 23:37:14 +01:00
Kostya Shishkov
5462dde194
metasound: Fix error message argument
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-08 16:50:17 +01:00
Michael Niedermayer
cbb7f56dfe
metasound & twinvqdec: return the number of read bytes from read_bitstream
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 17:24:07 +02:00
Michael Niedermayer
6063f012f2
Merge commit '9e7b62f0fb7462a902330fcc82cf596388f0187b'
...
* commit '9e7b62f0fb7462a902330fcc82cf596388f0187b':
twinvq: set block align for codecs and use it in size checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26 14:47:15 +02:00
Kostya Shishkov
9e7b62f0fb
twinvq: set block align for codecs and use it in size checks
...
This both allows factoring out size check for both MetaSound and TwinVQ-VQF
decoders and fixes the situation when there are several MetaSound frames
stuffed together (that happens in 8kHz @ 8kbps MetaSound in ASF for example).
2013-08-26 09:23:39 +02:00
Michael Niedermayer
69ea65b46f
Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'
...
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
Voxware MetaSound decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-08 12:11:33 +02:00
Kostya Shishkov
3e5898782d
Voxware MetaSound decoder
2013-08-08 10:52:44 +02:00
