1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
Michael Niedermayer bd7dce594e Merge commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f'
* commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f':
  h264: merge the init and reinit paths in update_thread_context()

Conflicts:
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29 15:21:20 +02:00
..
2015-04-18 14:13:59 -03:00
2015-04-20 04:11:23 +02:00
2015-04-22 17:45:51 +02:00
2015-04-18 14:14:24 -03:00
2015-04-18 14:14:11 -03:00
2015-04-19 23:45:35 +01:00
2015-04-28 00:04:58 +02:00
2015-04-28 00:04:58 +02:00
2015-04-28 00:04:58 +02:00
2015-04-28 00:04:58 +02:00
2015-04-24 00:00:20 -07:00
2015-04-24 00:00:12 -07:00
2015-04-20 14:36:41 +02:00
2015-04-02 16:04:22 +02:00
2015-04-24 16:54:31 +02:00
2015-04-18 18:07:54 -03:00