RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
56,798 Commits 36 Branches 398 Tags 225 MiB
Commit Graph

6 Commits

Author SHA1 Message Date
Michael Niedermayer 015f7ce7d7 Merge commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4' 
* commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4':
  twinvqdec: Check the ibps parameter separately

See: b8dc5f8bb3
See: 98b377004d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 12:42:19 +02:00
Martin Storsjö c77d409bf9 twinvqdec: Check the ibps parameter separately 
This is required, since invalid parameters actually could
pass the switch check below.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-17 23:22:46 +03: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 7d03e60c12 Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab' 
* 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>
 2013-08-06 16:37:08 +02:00
Kostya Shishkov 86f4c59bd6 twinvq: Split VQF-specific part from common TwinVQ decoder core 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-05 20:59:23 +02:00