virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

h264: move last_slice_type reset into decode_slice_header

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-30 20:51:07 +01:00
parent 11c3381ce3
commit 285c5f6838
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/h264.c
View File

@ -1772,9 +1772,7 @@ static int decode_update_thread_context(AVCodecContext *dst,
copy_picture_range(h->delayed_pic, h1->delayed_pic, copy_picture_range(h->delayed_pic, h1->delayed_pic,
MAX_DELAYED_PIC_COUNT + 2, h, h1); MAX_DELAYED_PIC_COUNT + 2, h, h1);
h->last_slice_type = h1->last_slice_type;
h->sync = h1->sync; h->sync = h1->sync;
memcpy(h->last_ref_count, h1->last_ref_count, sizeof(h->last_ref_count));
if (context_reinitialized) if (context_reinitialized)
h264_set_parameter_from_sps(h); h264_set_parameter_from_sps(h);
@ -3560,6 +3558,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
memset(h->slice_table, -1, memset(h->slice_table, -1,
(h->mb_height * h->mb_stride - 1) * sizeof(*h->slice_table)); (h->mb_height * h->mb_stride - 1) * sizeof(*h->slice_table));
} }
h0->last_slice_type = -1;
} }
if (h != h0 && (ret = clone_slice(h, h0)) < 0) if (h != h0 && (ret = clone_slice(h, h0)) < 0)
return ret; return ret;