diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 12:36:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 17:42:04 +0200 |
| commit | 7be2d2a70cd20d88fd826a83f87037d14681a579 (patch) | |
| tree | ed3adf7b50fc628acb98fb1c069f699c992b75ef /libavcodec/h264_picture.c | |
| parent | 98d0c4236c7542c87f012228d3bc88aea67bddc2 (diff) | |
| download | ffmpeg-7be2d2a70cd20d88fd826a83f87037d14681a579.tar.gz | |
avcodec/h264: Use only one ERContext
This fixes slice threads with error concealment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_picture.c')
| -rw-r--r-- | libavcodec/h264_picture.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 76286ae8f3..1880a58e50 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -184,6 +184,7 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) ff_vdpau_h264_picture_complete(h); #if CONFIG_ERROR_RESILIENCE + av_assert0(sl == h->slice_ctx); /* * FIXME: Error handling code does not seem to support interlaced * when slices span multiple rows |