The code conflicts with moving the h264_init_ps() call point
Signed-off-by: Michael Niedermayer <[email protected]>
---
libavcodec/h264.c | 2 --
libavcodec/h264_refs.c | 5 -----
2 files changed, 7 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f79735b..db68c05 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -776,8 +776,6 @@ void ff_h264_flush_change(H264Context *h)
h->frame_recovered = 0;
h->current_slice = 0;
h->mmco_reset = 1;
- for (i = 0; i < h->nb_slice_ctx; i++)
- h->slice_ctx[i].list_count = 0;
}
/* forget old pics after a seek */
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 7fafb82..6bac897a 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -581,11 +581,6 @@ void ff_h264_remove_all_refs(H264Context *h)
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 void generate_sliding_window_mmcos(H264Context *h)
--
1.7.9.5
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
