diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 18:38:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 18:46:11 +0200 |
| commit | f620315fa5b1710e3a47b80ca2cd4597510804ba (patch) | |
| tree | 4fae7d7757418580e20bd8bd675a229798abdd7c /libavformat/nutdec.c | |
| parent | cf9051deac498eed70ab68c562b761c55251d270 (diff) | |
| parent | e49e0f58e273237f83b4486f3536931ed1943d18 (diff) | |
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>
Diffstat (limited to 'libavformat/nutdec.c')
0 files changed, 0 insertions, 0 deletions