[FFmpeg-cvslog] Merge commit 'e49e0f58e273237f83b4486f3536931ed1943d18'
Michael Niedermayer
git at videolan.org
Sat Jun 27 18:54:03 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 27 18:38:17 2015 +0200| [f620315fa5b1710e3a47b80ca2cd4597510804ba] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f620315fa5b1710e3a47b80ca2cd4597510804ba
---
More information about the ffmpeg-cvslog
mailing list