FFmpeg/libavcodec
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-14 15:09:33 +02:00
2015-06-24 14:45:16 +01:00
2015-06-19 13:57:36 +02:00
2015-06-26 01:00:17 +02:00
2015-06-24 15:09:31 -07:00
2015-06-17 20:11:43 +02:00
2015-06-26 22:18:24 +02:00
2015-06-26 23:35:26 +02:00