ffmpeg | branch: master | Clément Bœsch <[email protected]> | Sat Jul 9 14:45:12 2016 +0200| [a7ce5b25c03abef6f3a2349b76343904513c46b3] | committer: Clément Bœsch
Merge commit '84b2d3fb68caf71cff4b80b44ff865d7ae2531ce' * commit '84b2d3fb68caf71cff4b80b44ff865d7ae2531ce': h264: Drop unused function check_opcodes() Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7ce5b25c03abef6f3a2349b76343904513c46b3 --- libavcodec/h264_refs.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 5905276..444849a 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -586,21 +586,6 @@ void ff_h264_remove_all_refs(H264Context *h) } } -static int check_opcodes(MMCO *mmco1, MMCO *mmco2, int n_mmcos) -{ - int i; - - for (i = 0; i < n_mmcos; i++) { - if (mmco1[i].opcode != mmco2[i].opcode) { - av_log(NULL, AV_LOG_ERROR, "MMCO opcode [%d, %d] at %d mismatches between slices\n", - mmco1[i].opcode, mmco2[i].opcode, i); - return -1; - } - } - - return 0; -} - static void generate_sliding_window_mmcos(H264Context *h) { MMCO *mmco = h->mmco; ====================================================================== diff --cc libavcodec/h264_refs.c index 5905276,2e43a8f..444849a --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@@ -577,30 -522,8 +577,15 @@@ void ff_h264_remove_all_refs(H264Contex h->short_ref[i] = NULL; } h->short_ref_count = 0; + + memset(h->default_ref, 0, sizeof(h->default_ref)); + for (i = 0; i < h->nb_slice_ctx; i++) { + H264SliceContext *sl = &h->slice_ctx[i]; + sl->list_count = sl->ref_count[0] = sl->ref_count[1] = 0; + memset(sl->ref_list, 0, sizeof(sl->ref_list)); + } } - static int check_opcodes(MMCO *mmco1, MMCO *mmco2, int n_mmcos) - { - int i; - - for (i = 0; i < n_mmcos; i++) { - if (mmco1[i].opcode != mmco2[i].opcode) { - av_log(NULL, AV_LOG_ERROR, "MMCO opcode [%d, %d] at %d mismatches between slices\n", - mmco1[i].opcode, mmco2[i].opcode, i); - return -1; - } - } - - return 0; - } - static void generate_sliding_window_mmcos(H264Context *h) { MMCO *mmco = h->mmco; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
