har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/h264_parser: don't alter decoder private data

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2022-01-24 13:47:04 -03:00
parent 2bc8c87b2e
commit a394d35a43
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264_parser.c
View File

@ -247,7 +247,6 @@ static inline int parse_nal_units(AVCodecParserContext *s,
const uint8_t * const buf, int buf_size) const uint8_t * const buf, int buf_size)
{ {
H264ParseContext *p = s->priv_data; H264ParseContext *p = s->priv_data;
H264Context *h = avctx->priv_data;
H2645RBSP rbsp = { NULL }; H2645RBSP rbsp = { NULL };
H2645NAL nal = { NULL }; H2645NAL nal = { NULL };
int buf_index, next_avc; int buf_index, next_avc;
@ -553,11 +552,9 @@ static inline int parse_nal_units(AVCodecParserContext *s,
p->last_picture_structure = s->picture_structure; p->last_picture_structure = s->picture_structure;
p->last_frame_num = p->poc.frame_num; p->last_frame_num = p->poc.frame_num;
} }
if (h && sps->timing_info_present_flag) { if (sps->timing_info_present_flag) {
int64_t den = sps->time_scale; int64_t den = sps->time_scale;
if (p->sei.unregistered.x264_build >= 0) if (p->sei.unregistered.x264_build < 44U)
h->x264_build = p->sei.unregistered.x264_build;
if (h->x264_build < 44U)
den *= 2; den *= 2;
av_reduce(&avctx->framerate.den, &avctx->framerate.num, av_reduce(&avctx->framerate.den, &avctx->framerate.num,
sps->num_units_in_tick * avctx->ticks_per_frame, den, 1 << 30); sps->num_units_in_tick * avctx->ticks_per_frame, den, 1 << 30);