Michael Niedermayer
e9d5a6f1c5
Merge commit '327ff82bac3081d918dceb4931c77e25d0a1480d' into release/0.10 ...
* commit '327ff82bac3081d918dceb4931c77e25d0a1480d':
msrle: convert MS RLE decoding function to bytestream2.
Update Changelog for the 0.8.6 Release
wmaprodec: require block_align to be set.
ivi_common: do not call MC for intra frames when dc_transform is unset
roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
Revert "libmp3lame: use the correct remaining buffer size when flushing"
lzo: fix overflow checking in copy_backptr()
flacdec: simplify bounds checking in flac_probe()
atrac3: avoid oversized shifting in decode_bytes()
avconv: skip attached files when selecting streams to read from.
lavf: fix arithmetic overflows in avformat_seek_file()
Conflicts:
Changelog
avconv.c
libavcodec/libmp3lame.c
libavcodec/msrledec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-07 15:42:45 +02:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-01-10 23:12:18 +01:00
2011-12-09 00:05:51 +01:00
2011-11-23 04:02:17 +01:00
2011-12-22 01:51:53 +01:00
2011-11-23 04:02:17 +01:00
2011-11-11 04:24:00 +01:00
2012-01-16 17:38:23 +01:00
2011-12-10 02:01:03 +01:00
2011-05-22 04:53:19 +02:00
2011-11-07 03:01:43 +01:00
2011-12-13 00:39:48 +01:00
2012-03-16 09:01:08 +01:00
2012-01-22 23:06:04 +01:00
2011-11-23 04:02:17 +01:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2012-01-04 01:12:34 +01:00
2011-09-27 02:14:37 +02:00
2011-09-27 02:14:37 +02:00
2011-03-19 13:33:20 +00:00
2011-12-05 00:11:57 +01:00
2011-03-19 13:33:20 +00:00
2011-12-05 20:05:44 +01:00
2011-09-21 21:25:43 +02:00
2011-11-07 03:01:43 +01:00
2011-11-23 04:02:17 +01:00
2012-03-16 09:01:08 +01:00
2012-03-16 09:01:08 +01:00
2012-10-16 04:25:51 +02:00
2011-12-12 01:25:37 +01:00
2011-12-23 00:18:36 +01:00
2011-08-30 10:03:13 +02:00
2012-10-25 21:09:21 +02:00
2011-10-16 21:51:28 +02:00
2011-12-23 11:43:29 +01:00
2011-11-23 04:02:17 +01:00
2011-06-28 13:14:46 +02:00
2011-06-28 13:14:46 +02:00
2011-12-13 00:39:48 +01:00
2011-10-12 05:40:57 +02:00
2011-12-12 01:25:37 +01:00
2011-12-11 18:47:19 +00:00
2011-11-23 04:02:17 +01:00
2011-06-18 05:10:38 +02:00
2011-06-08 05:25:28 +02:00
2011-12-05 00:11:57 +01:00
2011-07-04 00:45:21 +02:00
2010-01-16 04:49:02 +00:00
2011-10-22 19:49:27 +02:00
2011-07-12 01:42:32 +02:00
2011-03-19 13:33:20 +00:00
2012-01-09 22:35:45 +01:00
2011-12-08 18:47:47 +01:00
2013-04-07 15:42:45 +02:00
2011-12-31 16:31:15 +01:00
2012-03-16 09:01:08 +01:00
2011-06-29 05:23:12 +02:00
2011-11-23 04:02:17 +01:00
2011-07-04 00:45:21 +02:00
2011-11-23 04:02:17 +01:00
2011-12-25 18:55:43 +01:00
2011-12-25 18:55:43 +01:00
2013-01-17 02:33:07 +01:00
2011-12-05 21:13:45 +01:00
2011-11-17 02:44:33 +01:00
2011-12-13 00:39:48 +01:00
2011-06-29 23:49:03 +01:00
2011-06-29 23:49:03 +01:00
2012-01-22 00:46:19 +01:00
2011-11-25 04:34:44 +01:00
2011-11-28 02:44:05 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-12-03 00:35:20 +01:00
2011-11-24 16:55:45 +01:00
2011-07-05 02:26:17 +02:00
2011-11-23 04:02:17 +01:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2012-01-06 02:45:12 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00
2011-12-22 03:01:17 +01:00
2011-03-19 13:33:20 +00:00
e9d5a6f1c5