diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2017-03-27 09:39:24 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2017-03-28 18:04:27 -0400 |
| commit | 8c2aa45d4a99dc0d9990dfb56782487006f718c3 (patch) | |
| tree | d5e50fe4ee8eeac3b0da419f540acce1bfe00f37 /libavcodec/h264_slice.c | |
| parent | 0c466417846f80a134dd7078435829c8e47fcbb0 (diff) | |
| download | ffmpeg-8c2aa45d4a99dc0d9990dfb56782487006f718c3.tar.gz | |
h264: revert 1189af429211ac650aac730368a6cf5b23756605.
The patch introduces race conditions.
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index a703853872..fa1e9ae829 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -383,9 +383,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->picture_structure = h1->picture_structure; h->mb_aff_frame = h1->mb_aff_frame; h->droppable = h1->droppable; - h->backup_width = h1->backup_width; - h->backup_height = h1->backup_height; - h->backup_pix_fmt = h1->backup_pix_fmt; for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) { ff_h264_unref_picture(h, &h->DPB[i]); |