[FFmpeg-cvslog] avcodec/h264_parser: don't alter decoder private data
James Almer
git at videolan.org
Mon Jan 24 19:15:24 EET 2022
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Jan 24 13:47:04 2022 -0300| [3c804fdd4a37a7130a85e38ab67daa38bb8c1d35] | committer: James Almer
avcodec/h264_parser: don't alter decoder private data
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c804fdd4a37a7130a85e38ab67daa38bb8c1d35
---
libavcodec/h264_parser.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index bb84cea821..cfbf6f4486 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -247,7 +247,6 @@ static inline int parse_nal_units(AVCodecParserContext *s,
const uint8_t * const buf, int buf_size)
{
H264ParseContext *p = s->priv_data;
- H264Context *h = avctx->priv_data;
H2645RBSP rbsp = { NULL };
H2645NAL nal = { NULL };
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_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;
- if (p->sei.unregistered.x264_build >= 0)
- h->x264_build = p->sei.unregistered.x264_build;
- if (h->x264_build < 44U)
+ if (p->sei.unregistered.x264_build < 44U)
den *= 2;
av_reduce(&avctx->framerate.den, &avctx->framerate.num,
sps->num_units_in_tick * avctx->ticks_per_frame, den, 1 << 30);
More information about the ffmpeg-cvslog
mailing list