Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -1000,32 +1000,32 @@ static int send_next_delayed_frame(H264Context *h, AVFrame *dst_frame, · 999 unmodified lines | |||
| 1000 | h->first_field = 0; | 1000 | h->first_field = 0; |
| 1001 | 1001 | ||
| 1002 | while (h->delayed_pic[0]) { | 1002 | while (h->delayed_pic[0]) { |
| 1003 | out = h->delayed_pic[0]; | 1003 | out = h->delayed_pic[0]; |
| 1004 | out_idx = 0; | 1004 | out_idx = 0; |
| 1005 | for (i = 1; | 1005 | for (i = 1; |
| 1006 | h->delayed_pic[i] && | 1006 | h->delayed_pic[i] && |
| 1007 | !(h->delayed_pic[i]->f->flags & AV_FRAME_FLAG_KEY) && | 1007 | !(h->delayed_pic[i]->f->flags & AV_FRAME_FLAG_KEY) && |
| 1008 | !h->delayed_pic[i]->mmco_reset; | 1008 | !h->delayed_pic[i]->mmco_reset; |
| 1009 | i++) | 1009 | i++) |
| 1010 | if (h->delayed_pic[i]->poc < out->poc) { | 1010 | if (h->delayed_pic[i]->poc < out->poc) { |
| 1011 | out = h->delayed_pic[i]; | 1011 | out = h->delayed_pic[i]; |
| 1012 | out_idx = i; | 1012 | out_idx = i; |
| 1013 | } | 1013 | } |
| 1014 | 1014 | ||
| 1015 | for (i = out_idx; h->delayed_pic[i]; i++) | 1015 | for (i = out_idx; h->delayed_pic[i]; i++) |
| 1016 | h->delayed_pic[i] = h->delayed_pic[i + 1]; | 1016 | h->delayed_pic[i] = h->delayed_pic[i + 1]; |
| 1017 | 1017 | ||
| 1018 | if (out) { | 1018 | if (out) { |
| 1019 | h->frame_recovered |= out->recovered; | 1019 | h->frame_recovered |= out->recovered; |
| 1020 | out->recovered |= h->frame_recovered & FRAME_RECOVERED_SEI; | 1020 | out->recovered |= h->frame_recovered & FRAME_RECOVERED_SEI; |
| 1021 | 1021 | ||
| 1022 | out->reference &= ~DELAYED_PIC_REF; | 1022 | out->reference &= ~DELAYED_PIC_REF; |
| 1023 | ret = finalize_frame(h, dst_frame, out, got_frame); | 1023 | ret = finalize_frame(h, dst_frame, out, got_frame); |
| 1024 | if (ret < 0) | 1024 | if (ret < 0) |
| 1025 | return ret; | 1025 | return ret; |
| 1026 | if (*got_frame) | 1026 | if (*got_frame) |
| 1027 | break; | 1027 | break; |
| 1028 | } | 1028 | } |
| 1029 | } | 1029 | } |
| 1030 | 1030 | ||
| 1031 | return buf_index; | 1031 | return buf_index; |