Michael Niedermayer
bd5c6a519e
Merge commit '5ec0bdf2c524224f30ba4786f47324970aed4aaa'
...
* commit '5ec0bdf2c524224f30ba4786f47324970aed4aaa':
h264: do not update the context fields copied between threads after finish_setup()
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
See: f111831ed61103f9fa8fdda41473a23da016bdaa and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-27 22:15:01 +02:00
..
2015-06-24 08:41:32 +02:00
2015-06-25 19:29:02 +02:00
2015-06-25 20:06:47 -07:00
2015-06-26 19:07:51 -07:00
2015-06-25 19:29:02 +02:00
2015-06-24 14:45:16 +01:00
2015-06-25 20:07:01 +00:00
2015-06-27 20:56:30 +02:00
2015-06-26 23:11:17 +02:00
2015-06-27 22:15:01 +02:00
2015-06-27 22:15:01 +02:00
2015-06-27 22:15:01 +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-25 20:06:47 -07: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-23 18:59:00 +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-27 03:43:23 +02:00
2015-06-22 22:19:35 -07:00
2015-06-27 09:28:34 -07:00
2015-06-24 02:48:37 +02:00
2015-06-26 19:10:46 +02:00
2015-06-26 22:18:24 +02:00
2015-06-24 14:45:00 +01:00
2015-06-26 23:35:26 +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