RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/dpx: respect side data preference 

If the time code side data is overridden by the packet level, we also
make sure not to update `p->metadata` to a mismatched timecode.
This commit is contained in:
Niklas Haas 2024-02-19 12:47:24 +01:00 committed by Anton Khirnov
parent 0b7aefe698
commit 588c5c3d51
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/dpx.c
View File

@ -287,19 +287,21 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p,
tc = av_bswap32(read32(&buf, endian));
if (i != 0xFFFFFFFF) {
AVFrameSideData *tcside =
av_frame_new_side_data(p, AV_FRAME_DATA_S12M_TIMECODE,
sizeof(uint32_t) * 4);
if (!tcside)
return AVERROR(ENOMEM);
AVFrameSideData *tcside;
ret = ff_frame_new_side_data(avctx, p, AV_FRAME_DATA_S12M_TIMECODE,
sizeof(uint32_t) * 4, &tcside);
if (ret < 0)
return ret;
tc_sd = (uint32_t*)tcside->data;
tc_sd[0] = 1;
tc_sd[1] = tc;
if (tcside) {
tc_sd = (uint32_t*)tcside->data;
tc_sd[0] = 1;
tc_sd[1] = tc;
av_timecode_make_smpte_tc_string2(tcbuf, avctx->framerate,
tc_sd[1], 0, 0);
av_dict_set(&p->metadata, "timecode", tcbuf, 0);
av_timecode_make_smpte_tc_string2(tcbuf, avctx->framerate,
tc_sd[1], 0, 0);
av_dict_set(&p->metadata, "timecode", tcbuf, 0);
}
}
}