Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity
73521 commits 38 branches 415 tags 263 MiB
Commit graph

15 commits

Author SHA1 Message Date
Michael Niedermayer
8d024c5107 Merge commit 'cc8163e1a3' 
* commit 'cc8163e1a3':
  avcodec: more correct printf specifiers

Conflicts:
	libavcodec/4xm.c
	libavcodec/alsdec.c
	libavcodec/dfa.c
	libavcodec/h264_ps.c
	libavcodec/jpeg2000dec.c
	libavcodec/lagarith.c
	libavcodec/mpeg12dec.c
	libavcodec/rv10.c
	libavcodec/svq3.c
	libavcodec/wmaprodec.c
	libavcodec/xwddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 18:43:40 +01:00
Diego Biurrun
cc8163e1a3 avcodec: more correct printf specifiers 2014-03-22 14:08:20 +01:00
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
Michael Niedermayer
2cfdc2879a Merge commit 'ddb839e928' 
* commit 'ddb839e928':
  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 '5462dde194' 
* commit '5462dde194':
  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 '9e7b62f0fb' 
* commit '9e7b62f0fb':
  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 '3e5898782d' 
* commit '3e5898782d':
  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