}
av_buffer_unref(&p->ps.pps_ref);
- av_buffer_unref(&p->ps.sps_ref);
p->ps.pps = NULL;
p->ps.sps = NULL;
p->ps.pps_ref = av_buffer_ref(p->ps.pps_list[pps_id]);
if (!p->ps.pps_ref)
goto fail;
p->ps.pps = (const PPS*)p->ps.pps_ref->data;
-
- if (!p->ps.sps_list[p->ps.pps->sps_id]) {
- av_log(avctx, AV_LOG_ERROR,
- "non-existing SPS %u referenced\n", p->ps.pps->sps_id);
- goto fail;
- }
-
- p->ps.sps_ref = av_buffer_ref(p->ps.sps_list[p->ps.pps->sps_id]);
- if (!p->ps.sps_ref)
- goto fail;
- p->ps.sps = (const SPS*)p->ps.sps_ref->data;
-
- sps = p->ps.sps;
+ p->ps.sps = p->ps.pps->sps;
+ sps = p->ps.sps;
// heuristic to detect non marked keyframes
if (p->ps.sps->ref_frame_count <= 1 && p->ps.pps->ref_count[0] <= 1 && s->pict_type == AV_PICTURE_TYPE_I)
}
}
+ if (p->sei.picture_timing.present) {
+ ret = ff_h264_sei_process_picture_timing(&p->sei.picture_timing,
+ sps, avctx);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error processing the picture timing SEI\n");
+ p->sei.picture_timing.present = 0;
+ }
+ }
+
if (sps->pic_struct_present_flag && p->sei.picture_timing.present) {
switch (p->sei.picture_timing.pic_struct) {
case H264_SEI_PIC_STRUCT_TOP_FIELD: