mirror of https://git.ffmpeg.org/ffmpeg.git
Compare commits
5 Commits
4c8a6631ad
...
31327c2d07
Author | SHA1 | Date |
---|---|---|
James Almer | 31327c2d07 | |
Timo Rothenpieler | 59767636c7 | |
Michael Niedermayer | 091fdce87e | |
Michael Niedermayer | d9699464c3 | |
Michael Niedermayer | 5eb05f4450 |
|
@ -1969,13 +1969,13 @@ static void hls_prediction_unit(HEVCLocalContext *lc, int x0, int y0,
|
|||
|
||||
if (current_mv.pred_flag & PF_L0) {
|
||||
ref0 = refPicList[0].ref[current_mv.ref_idx[0]];
|
||||
if (!ref0 || !ref0->frame->data[0])
|
||||
if (!ref0 || !ref0->frame)
|
||||
return;
|
||||
hevc_await_progress(s, ref0, ¤t_mv.mv[0], y0, nPbH);
|
||||
}
|
||||
if (current_mv.pred_flag & PF_L1) {
|
||||
ref1 = refPicList[1].ref[current_mv.ref_idx[1]];
|
||||
if (!ref1 || !ref1->frame->data[0])
|
||||
if (!ref1 || !ref1->frame)
|
||||
return;
|
||||
hevc_await_progress(s, ref1, ¤t_mv.mv[1], y0, nPbH);
|
||||
}
|
||||
|
|
|
@ -1218,7 +1218,7 @@ static int decode_fctl_chunk(AVCodecContext *avctx, PNGDecContext *s,
|
|||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
if ((sequence_number == 0 || !s->last_picture.f->data[0]) &&
|
||||
if ((sequence_number == 0 || !s->last_picture.f) &&
|
||||
dispose_op == APNG_DISPOSE_OP_PREVIOUS) {
|
||||
// No previous frame to revert to for the first frame
|
||||
// Spec says to just treat it as a APNG_DISPOSE_OP_BACKGROUND
|
||||
|
|
|
@ -2651,6 +2651,7 @@ static int vp3_decode_frame(AVCodecContext *avctx, AVFrame *frame,
|
|||
if (avctx->skip_frame >= AVDISCARD_NONKEY && !s->keyframe)
|
||||
return buf_size;
|
||||
|
||||
ff_progress_frame_unref(&s->current_frame);
|
||||
ret = ff_progress_frame_get_buffer(avctx, &s->current_frame,
|
||||
AV_GET_BUFFER_FLAG_REF);
|
||||
if (ret < 0) {
|
||||
|
|
|
@ -9440,7 +9440,8 @@ static int mov_parse_tiles(AVFormatContext *s)
|
|||
break;
|
||||
}
|
||||
|
||||
if (k == grid->nb_tiles) {
|
||||
if (k == mov->nb_heif_item) {
|
||||
av_assert0(loop);
|
||||
av_log(s, AV_LOG_WARNING, "HEIF item id %d referenced by grid id %d doesn't "
|
||||
"exist\n",
|
||||
tile_id, grid->item->item_id);
|
||||
|
|
|
@ -30,14 +30,14 @@ lock(){
|
|||
checkout(){
|
||||
case "$repo" in
|
||||
file:*|/*) src="${repo#file:}" ;;
|
||||
git:*) git clone --quiet --branch "$branch" "$repo" "$src" ;;
|
||||
git:*|https:*) git clone --quiet --branch "$branch" "$repo" "$src" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
update()(
|
||||
cd ${src} || return
|
||||
case "$repo" in
|
||||
git:*) git fetch --quiet --force && git reset --quiet --hard "origin/$branch" ;;
|
||||
git:*|https:*) git fetch --quiet --force && git reset --quiet --hard "origin/$branch" ;;
|
||||
esac
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue