// SPS/PPS
for (i = 0; i < FF_ARRAY_ELEMS(h->ps.sps_list); i++) {
- av_buffer_unref(&h->ps.sps_list[i]);
- if (h1->ps.sps_list[i]) {
- h->ps.sps_list[i] = av_buffer_ref(h1->ps.sps_list[i]);
- if (!h->ps.sps_list[i])
- return AVERROR(ENOMEM);
- }
+ ret = av_buffer_replace(&h->ps.sps_list[i], h1->ps.sps_list[i]);
+ if (ret < 0)
+ return ret;
}
for (i = 0; i < FF_ARRAY_ELEMS(h->ps.pps_list); i++) {
- av_buffer_unref(&h->ps.pps_list[i]);
- if (h1->ps.pps_list[i]) {
- h->ps.pps_list[i] = av_buffer_ref(h1->ps.pps_list[i]);
- if (!h->ps.pps_list[i])
- return AVERROR(ENOMEM);
- }
+ ret = av_buffer_replace(&h->ps.pps_list[i], h1->ps.pps_list[i]);
+ if (ret < 0)
+ return ret;
}
- av_buffer_unref(&h->ps.pps_ref);
+ ret = av_buffer_replace(&h->ps.pps_ref, h1->ps.pps_ref);
+ if (ret < 0)
+ return ret;
h->ps.pps = NULL;
h->ps.sps = NULL;
if (h1->ps.pps_ref) {
- h->ps.pps_ref = av_buffer_ref(h1->ps.pps_ref);
- if (!h->ps.pps_ref)
- return AVERROR(ENOMEM);
h->ps.pps = (const PPS*)h->ps.pps_ref->data;
h->ps.sps = h->ps.pps->sps;
}
h->frame_recovered = h1->frame_recovered;
- av_buffer_unref(&h->sei.a53_caption.buf_ref);
- if (h1->sei.a53_caption.buf_ref) {
- h->sei.a53_caption.buf_ref = av_buffer_ref(h1->sei.a53_caption.buf_ref);
- if (!h->sei.a53_caption.buf_ref)
- return AVERROR(ENOMEM);
+ ret = av_buffer_replace(&h->sei.a53_caption.buf_ref, h1->sei.a53_caption.buf_ref);
+ if (ret < 0)
+ return ret;
+
+ for (i = 0; i < h->sei.unregistered.nb_buf_ref; i++)
+ av_buffer_unref(&h->sei.unregistered.buf_ref[i]);
+ h->sei.unregistered.nb_buf_ref = 0;
+
+ if (h1->sei.unregistered.nb_buf_ref) {
+ ret = av_reallocp_array(&h->sei.unregistered.buf_ref,
+ h1->sei.unregistered.nb_buf_ref,
+ sizeof(*h->sei.unregistered.buf_ref));
+ if (ret < 0)
+ return ret;
+
+ for (i = 0; i < h1->sei.unregistered.nb_buf_ref; i++) {
+ h->sei.unregistered.buf_ref[i] = av_buffer_ref(h1->sei.unregistered.buf_ref[i]);
+ if (!h->sei.unregistered.buf_ref[i])
+ return AVERROR(ENOMEM);
+ h->sei.unregistered.nb_buf_ref++;
+ }
}
+ h->sei.unregistered.x264_build = h1->sei.unregistered.x264_build;
if (!h->cur_pic_ptr)
return 0;
int ff = h->sei.picture_timing.timecode[i].frame;
tc_sd[i + 1] = av_timecode_get_smpte(h->avctx->framerate, drop, hh, mm, ss, ff);
- av_timecode_make_smpte_tc_string(tcbuf, tc_sd[i + 1], 0);
+ av_timecode_make_smpte_tc_string2(tcbuf, h->avctx->framerate, tc_sd[i + 1], 0, 0);
av_dict_set(&out->metadata, "timecode", tcbuf, 0);
}
h->sei.picture_timing.timecode_cnt = 0;
prev->f->format,
prev->f->width,
prev->f->height);
- h->short_ref[0]->poc = prev->poc + 2;
+ h->short_ref[0]->poc = prev->poc + 2U;
} else if (!h->frame_recovered && !h->avctx->hwaccel)
ff_color_frame(h->short_ref[0]->f, c);
h->short_ref[0]->frame_num = h->poc.prev_frame_num;