diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-07 02:47:36 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-17 15:20:29 +0200 |
commit | 7fa861dfe06ef184d8e2b3e2545b8890b36bf07e (patch) | |
tree | 2d6bd0cbb9251d2d192c57f8f96d78fc68fa9f34 /libavfilter/vf_blend.c | |
parent | 48f616ceeecd296e033456926fbfe7223a318759 (diff) | |
download | ffmpeg-7fa861dfe06ef184d8e2b3e2545b8890b36bf07e.tar.gz |
avcodec/h264: finish previous slices before switching to single thread mode
Fixes null pointer dereference
Fixes Ticket4438
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c4b2017ba66e1623da9f527704c61c86a6e74844)
Conflicts:
libavcodec/h264.c
(cherry picked from commit 09cc7aee3f4d1bd1d7107d38520f782c62c14036)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_blend.c')
0 files changed, 0 insertions, 0 deletions