[FFmpeg-soc] [soc] Avoid a deadlock in damaged streams where the current picture ends up in h->ref_list.

[Alexander Strange]

---
 libavcodec/h264.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 7506851..ba17978 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1709,15 +1709,19 @@ static inline void mc_part_y(H264Context *h, int refs[2][48], int n, int delta,
     if(list0){
         int ref_n = h->ref_cache[0][ scan8[n] ], my;
         Picture *ref= &h->ref_list[0][ref_n];
+        if(ref->data[0] != s->current_picture_ptr->data[0]){
         my = mc_dir_part_y(h, ref, n, delta, 0, y_offset);
         refs[0][ref_n] = FFMAX(refs[0][ref_n], my);
+        }
     }
 
     if(list1){
         int ref_n = h->ref_cache[1][ scan8[n] ];
         Picture *ref= &h->ref_list[1][ref_n];
+        if(ref->data[0] != s->current_picture_ptr->data[0]){
         my = mc_dir_part_y(h, ref, n, delta, 1, y_offset);
         refs[1][ref_n] = FFMAX(refs[1][ref_n], my);
+        }
     }
 }
 

_______________________________________________
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc