[FFmpeg-cvslog] avcodec/h264: Only recover from reference pictures

Michael Niedermayer git at videolan.org
Wed Apr 27 02:16:01 CEST 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Apr 27 01:33:25 2016 +0200| [566d64d4fbb2d949bbb8d26b1291ddf6ea58afb9] | committer: Michael Niedermayer

avcodec/h264: Only recover from reference pictures

Fixes spec compliance
Fixes Ticket5346

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 22375aa..a85953e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1472,7 +1472,7 @@ again:
                     (h->nal_unit_type == NAL_IDR_SLICE);
 
                 if (h->nal_unit_type == NAL_IDR_SLICE ||
-                    h->recovery_frame == h->frame_num) {
+                    (h->recovery_frame == h->frame_num && h->nal_ref_idc)) {
                     h->recovery_frame         = -1;
                     h->cur_pic_ptr->recovered = 1;
                 }



More information about the ffmpeg-cvslog mailing list