Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-09 03:10:08 +00:00
Code Issues Projects Releases Packages Wiki Activity
62575 commits 38 branches 415 tags 286 MiB
Commit graph

6 commits

Author SHA1 Message Date
Michael Niedermayer
ac021fdc40 Merge commit '56d061ce9d' 
* commit '56d061ce9d':
  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 '1afa8a7568' 
* commit '1afa8a7568':
  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
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
Michael Niedermayer
7d03e60c12 Merge commit '86f4c59bd6' 
* commit '86f4c59bd6':
  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