Michael Niedermayer
f620315fa5
Merge commit 'e49e0f58e273237f83b4486f3536931ed1943d18'
...
* commit 'e49e0f58e273237f83b4486f3536931ed1943d18':
h264: make sure the slices do not overlap during slice threading
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
See: 43b434210e597d484aef57c4139c3126d22b7e2b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-27 18:46:11 +02:00
..
2015-06-24 08:41:32 +02:00
2015-06-22 20:18:10 +02:00
2015-06-16 21:48:51 +02:00
2015-06-16 21:48:51 +02:00
2015-06-25 19:29:02 +02:00
2015-06-17 20:53:34 +02:00
2015-06-25 20:06:47 -07:00
2015-06-13 20:39:57 +02:00
2015-06-14 15:09:33 +02:00
2015-06-26 19:07:51 -07:00
2015-06-16 21:48:51 +02:00
2015-06-22 20:18:10 +02:00
2015-06-22 20:18:10 +02:00
2015-06-13 09:28:41 +02:00
2015-06-25 19:29:02 +02:00
2015-06-24 14:45:16 +01:00
2015-06-19 16:51:54 +02:00
2015-06-12 21:42:50 +02:00
2015-06-25 20:07:01 +00:00
2015-06-19 02:25:48 +02:00
2015-06-18 01:01:06 +02:00
2015-06-19 13:57:36 +02:00
2015-06-16 12:55:20 +02:00
2015-06-12 21:25:21 +02:00
2015-06-12 21:25:21 +02:00
2015-06-12 20:57:37 +02:00
2015-06-12 20:57:37 +02:00
2015-06-12 20:57:37 +02:00
2015-06-12 20:57:37 +02:00
2015-06-17 13:50:14 +02:00
2015-06-17 13:50:14 +02:00
2015-06-26 23:11:17 +02:00
2015-06-27 18:46:11 +02:00
2015-06-26 23:11:17 +02:00
2015-06-27 18:46:11 +02:00
2015-06-11 17:10:41 +02:00
2015-06-11 17:10:41 +02:00
2015-06-13 02:21:55 +02:00
2015-06-13 02:21:55 +02:00
2015-06-22 22:47:32 +02:00
2015-06-22 22:47:32 +02:00
2015-06-22 22:47:32 +02:00
2015-06-18 18:03:21 +02:00
2015-06-25 20:06:47 -07:00
2015-06-13 21:09:24 -07:00
2015-06-10 13:53:03 +02:00
2015-06-10 13:53:03 +02:00
2015-06-19 14:00:12 +02:00
2015-06-19 14:00:12 +02:00
2015-06-09 17:44:13 +02:00
2015-06-12 19:52:30 +02:00
2015-06-12 21:05:57 +02:00
2015-06-12 20:57:37 +02:00
2015-06-26 01:00:17 +02:00
2015-06-26 21:00:10 +02:00
2015-06-26 21:00:10 +02:00
2015-06-27 15:22:15 +02:00
2015-06-13 16:53:27 -03:00
2015-06-13 16:53:27 -03:00
2015-06-23 18:59:00 +02:00
2015-06-22 01:54:51 +02:00
2015-06-09 18:59:30 +02:00
2015-06-16 21:48:51 +02:00
2015-06-24 12:39:21 +02:00
2015-06-26 16:43:37 -03:00
2015-06-24 15:09:31 -07:00
2015-06-21 22:57:54 +02:00
2015-06-17 14:13:43 +01:00
2015-06-18 14:40:11 +02:00
2015-06-27 03:43:23 +02:00
2015-06-21 02:53:06 +02:00
2015-06-21 02:53:06 +02:00
2015-06-12 21:25:21 +02:00
2015-06-12 20:57:37 +02:00
2015-06-22 22:19:35 -07:00
2015-06-27 09:28:34 -07:00
2015-06-11 00:48:41 +02:00
2015-06-12 21:34:22 +02:00
2015-06-12 21:34:22 +02:00
2015-06-12 20:47:14 +02:00
2015-06-12 20:47:14 +02:00
2015-06-24 02:48:37 +02:00
2015-06-26 19:10:46 +02:00
2015-06-10 20:41:36 +02:00
2015-06-10 20:41:36 +02:00
2015-06-12 21:25:21 +02:00
2015-06-12 20:47:14 +02:00
2015-06-12 21:25:21 +02:00
2015-06-17 20:11:43 +02:00
2015-06-15 17:11:01 +02:00
2015-06-20 22:36:15 +02:00
2015-06-26 22:18:24 +02:00
2015-06-12 23:04:30 +02:00
2015-06-11 04:53:37 +02:00
2015-06-24 14:45:00 +01:00
2015-06-18 12:33:15 +02:00
2015-06-18 12:33:15 +02:00
2015-06-12 21:05:57 +02:00
2015-06-12 21:05:57 +02:00
2015-06-12 21:25:21 +02:00
2015-06-12 21:25:21 +02:00
2015-06-26 23:35:26 +02:00
2015-06-13 00:51:29 +02:00
2015-06-22 20:47:21 +02:00
2015-06-22 20:47:21 +02:00
2015-06-09 23:21:51 +02:00
2015-06-10 12:21:04 +02:00
2015-06-23 04:19:05 +02:00
2015-06-22 20:57:41 +02:00
2015-06-24 21:06:58 +02:00
2015-06-22 21:15:50 +02:00
2015-06-27 11:19:57 +02:00
2015-06-23 13:31:54 +02:00
2015-06-26 19:39:29 +02:00
2015-06-26 19:07:51 -07:00
2015-06-25 20:06:47 -07:00
2015-06-26 19:07:51 -07:00
2015-06-25 04:29:03 +02:00
2015-06-12 21:25:21 +02:00