Michael Niedermayer
27e8298c03
Merge commit '94aefb1932be882fd93f66cf790ceb19ff575c19'
...
* commit '94aefb1932be882fd93f66cf790ceb19ff575c19':
4xm: do not overread the source buffer in decode_p_block
Conflicts:
libavcodec/4xm.c
The checks are replaced by av_assert0() as the conditions should
be impossible. If these asserts fail, there is a bug elsewhere
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-13 14:10:06 +02:00
..
2013-06-02 11:25:56 +02:00
2013-05-27 08:55:24 +02:00
2013-05-30 10:49:43 +02:00
2013-06-13 14:10:06 +02:00
2013-05-22 21:30:28 +02:00
2013-06-06 20:17:36 +00:00
2013-06-12 16:23:49 +02:00
2013-06-11 09:36:34 +02:00
2013-06-03 12:47:26 +02:00
2013-06-01 15:12:49 +02:00
2013-06-02 10:30:35 +02:00
2013-06-02 10:30:35 +02:00
2013-06-01 13:38:50 +02:00
2013-05-21 13:51:04 +02:00
2013-06-03 12:47:26 +02:00
2013-05-28 13:35:09 +02:00
2013-05-23 19:58:03 +00:00
2013-05-23 10:21:12 +00:00
2013-06-08 12:38:18 +02:00
2013-06-06 20:17:36 +00:00
2013-06-03 14:06:25 +02:00
2013-06-06 20:17:36 +00:00
2013-05-28 12:49:20 +02:00
2013-05-23 10:05:28 +00:00
2013-06-12 13:45:53 +02:00
2013-05-30 18:38:04 +02:00
2013-06-08 10:50:24 +02:00
2013-06-03 14:09:12 +02:00
2013-06-13 01:43:09 +02:00
2013-05-24 12:15:56 +02:00
2013-05-29 19:48:03 +02:00
2013-05-29 19:48:03 +02:00
2013-05-29 19:48:03 +02:00
2013-05-21 13:51:04 +02:00
2013-05-21 13:51:04 +02:00
2013-05-29 04:02:23 +02:00
2013-05-24 20:25:53 +02:00
2013-06-01 10:27:47 +02:00
2013-05-29 03:52:16 +02:00
2013-05-29 03:52:16 +02:00
2013-05-31 03:10:08 +02:00
2013-06-06 22:02:54 +02:00
2013-06-05 18:34:07 +02:00
2013-06-10 17:13:46 +02:00
2013-06-03 13:24:20 +02:00
2013-05-28 09:42:19 +02:00
2013-05-23 19:41:43 +00:00
2013-05-23 15:37:48 +02:00
2013-05-26 21:57:28 +00:00
2013-06-10 10:12:15 +02:00
2013-06-10 16:00:59 +02:00
2013-06-10 10:12:15 +02:00
2013-06-11 09:36:34 +02:00
2013-05-20 16:39:00 +02:00
2013-06-11 09:36:34 +02:00
2013-05-21 12:56:12 +02:00
2013-05-29 11:06:26 +02:00
2013-05-30 16:07:07 +02:00
2013-05-29 19:55:27 +02:00
2013-05-23 14:43:42 +02:00
2013-06-05 22:35:31 +00:00
2013-06-07 09:29:34 +00:00
2013-06-04 20:40:07 +02:00
2013-05-22 20:24:50 +02:00
2013-05-22 20:24:50 +02:00
2013-05-31 11:32:58 +02:00
2013-06-05 22:35:31 +00:00
2013-05-20 15:49:49 +02:00
2013-05-23 20:38:53 +00:00
2013-05-22 17:40:12 +02:00
2013-05-28 08:59:07 +02:00
2013-06-08 20:02:22 +02:00
2013-06-07 09:29:34 +00:00
2013-06-09 19:25:43 +02:00
2013-06-04 17:25:32 +00:00
2013-06-06 20:17:36 +00:00
2013-06-08 12:21:14 +02:00
2013-06-03 11:44:11 +02:00
2013-06-03 11:44:11 +02:00
2013-06-06 20:17:36 +00:00
2013-06-02 14:53:14 +00:00
2013-06-02 14:53:14 +00:00
2013-06-02 15:16:52 +00:00
2013-06-11 09:27:04 +02:00
2013-06-10 16:00:59 +02:00
2013-05-29 03:00:04 +02:00
2013-05-28 13:56:29 +03:00
2013-06-04 02:43:20 +02:00
2013-06-01 12:02:11 +00:00
2013-05-27 09:05:55 +02:00
2013-05-27 09:05:55 +02:00
2013-06-11 09:36:34 +02:00
2013-06-03 12:33:00 +02:00
2013-06-08 10:50:24 +02:00
2013-05-21 17:49:29 +00:00
2013-05-21 13:51:04 +02:00
2013-05-28 12:49:21 +02:00
2013-06-08 17:39:54 +00:00
2013-05-29 22:31:16 +02:00