diff options
author | Anton Khirnov <anton@khirnov.net> | 2015-01-28 13:26:24 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:15 +0100 |
commit | 51d8725a6e4c7f989d6f0f38b59cb54a2d72846c (patch) | |
tree | caef0ac89f1ae68553fdedf03e64f9427a4ac4c5 /libavcodec/h264.h | |
parent | 92e0b7342c0490894cbcea4461380321e0569de2 (diff) | |
download | ffmpeg-51d8725a6e4c7f989d6f0f38b59cb54a2d72846c.tar.gz |
h264: use the main H264Context as the parent for all slice contexts
There is now no need to have per-slice copies of the H264Context.
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 594c65db8f..a24c7c7253 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -1070,7 +1070,7 @@ int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc); int ff_pred_weight_table(H264Context *h, H264SliceContext *sl); int ff_set_ref_count(H264Context *h, H264SliceContext *sl); -int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Context *h0); +int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl); int ff_h264_execute_decode_slices(H264Context *h, unsigned context_count); int ff_h264_update_thread_context(AVCodecContext *dst, const AVCodecContext *src); |