1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavformat
Michael Niedermayer b96dc093ea Merge remote-tracking branch 'qatar/master'
* qatar/master:
  wmalosslessdec: increase channel_coeffs/residues size
  wmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14.
  lagarith: check count before writing zeros.
  wmaprodec: check num_vec_coeffs for validity
  avidec: use actually read size instead of requested size
  avidec: return 0, not packet size from read_packet().

Conflicts:
	libavcodec/lagarith.c
	libavcodec/wmalosslessdec.c
	libavcodec/wmaprodec.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-29 15:11:34 +02:00
..
2012-08-30 05:17:24 +02:00
2012-09-23 15:24:08 +02:00
2012-09-12 20:35:09 +02:00
2012-09-28 02:40:53 +02:00
2012-08-18 17:45:58 +02:00
2012-09-08 02:28:20 +02:00
2012-08-07 23:57:21 +02:00
2012-08-31 23:27:27 +02:00
2012-09-18 10:31:04 +02:00
2012-08-21 01:52:55 +02:00
2012-08-14 16:54:25 +02:00
2012-09-12 14:31:09 +02:00
2012-08-21 06:13:54 +02:00
2012-08-16 10:20:25 +02:00
2012-09-27 08:59:36 +02:00
2012-09-27 08:59:36 +02:00
2012-09-20 22:00:52 +02:00
2012-09-16 14:37:50 +02:00
2012-08-27 05:23:42 +02:00
2012-09-10 20:57:23 +02:00
2012-08-26 22:15:20 +02:00
2012-09-01 23:45:32 +02:00
2012-09-23 02:12:34 +02:00
2012-08-07 23:57:21 +02:00
2012-09-03 22:40:41 +02:00
2012-08-28 22:29:20 +02:00
2012-09-15 22:13:21 +02:00
2012-08-29 00:05:03 +02:00
2012-09-23 01:22:16 +02:00
2012-09-23 15:24:08 +02:00
2012-08-07 23:57:21 +02:00