diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2017-03-27 16:39:24 +0300 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2017-03-29 01:04:27 +0300 |
commit | 8c2aa45d4a99dc0d9990dfb56782487006f718c3 (patch) | |
tree | d5e50fe4ee8eeac3b0da419f540acce1bfe00f37 /libavcodec/h264dec.c | |
parent | 0c466417846f80a134dd7078435829c8e47fcbb0 (diff) |
h264: revert 1189af429211ac650aac730368a6cf5b23756605.
The patch introduces race conditions.
Diffstat (limited to 'libavcodec/h264dec.c')
-rw-r--r-- | libavcodec/h264dec.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 585ce86f37..25aeba7d71 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -307,9 +307,6 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) int i; h->avctx = avctx; - h->backup_width = -1; - h->backup_height = -1; - h->backup_pix_fmt = AV_PIX_FMT_NONE; h->cur_chroma_format_idc = -1; h->picture_structure = PICT_FRAME; @@ -861,14 +858,6 @@ static int output_frame(H264Context *h, AVFrame *dst, H264Picture *srcp) av_dict_set(&dst->metadata, "stereo_mode", ff_h264_sei_stereo_mode(&h->sei.frame_packing), 0); - h->backup_width = h->avctx->width; - h->backup_height = h->avctx->height; - h->backup_pix_fmt = h->avctx->pix_fmt; - - h->avctx->width = dst->width; - h->avctx->height = dst->height; - h->avctx->pix_fmt = dst->format; - if (srcp->sei_recovery_frame_cnt == 0) dst->key_frame = 1; if (!srcp->crop) @@ -1003,19 +992,6 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data, h->setup_finished = 0; h->nb_slice_ctx_queued = 0; - if (h->backup_width != -1) { - avctx->width = h->backup_width; - h->backup_width = -1; - } - if (h->backup_height != -1) { - avctx->height = h->backup_height; - h->backup_height = -1; - } - if (h->backup_pix_fmt != AV_PIX_FMT_NONE) { - avctx->pix_fmt = h->backup_pix_fmt; - h->backup_pix_fmt = AV_PIX_FMT_NONE; - } - ff_h264_unref_picture(h, &h->last_pic_for_ec); /* end of stream, output what is still in the buffers */ |