[FFmpeg-cvslog] avcodec/h264: use ff_h264_set_erpic() instead of memset

Michael Niedermayer git at videolan.org
Mon Mar 24 20:17:29 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 19:58:05 2014 +0100| [bce2abc9362d3403a74ec60f6bac5bb3e2cdcdc4] | committer: Michael Niedermayer

avcodec/h264: use ff_h264_set_erpic() instead of memset

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bce2abc9362d3403a74ec60f6bac5bb3e2cdcdc4
---

 libavcodec/h264_slice.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 7db5179..ed3c8fe 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -753,7 +753,7 @@ static int h264_frame_start(H264Context *h)
     h->cur_pic_ptr = pic;
     ff_h264_unref_picture(h, &h->cur_pic);
     if (CONFIG_ERROR_RESILIENCE) {
-        memset(&h->er.cur_pic, 0, sizeof(h->er.cur_pic));
+        ff_h264_set_erpic(&h->er.cur_pic, NULL);
     }
 
     if ((ret = ff_h264_ref_picture(h, &h->cur_pic, h->cur_pic_ptr)) < 0)
@@ -761,8 +761,8 @@ static int h264_frame_start(H264Context *h)
 
     if (CONFIG_ERROR_RESILIENCE) {
         ff_er_frame_start(&h->er);
-        memset(&h->er.last_pic, 0, sizeof(h->er.last_pic));
-        memset(&h->er.next_pic, 0, sizeof(h->er.next_pic));
+        ff_h264_set_erpic(&h->er.last_pic, NULL);
+        ff_h264_set_erpic(&h->er.next_pic, NULL);
     }
 
     assert(h->linesize && h->uvlinesize);



More information about the ffmpeg-cvslog mailing list