Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com> --- libavcodec/h264_parser.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 188ba41c0b..669a9a5ff7 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -306,10 +306,10 @@ static inline int parse_nal_units(AVCodecParserContext *s, break; } - av_fast_padded_malloc(&rbsp->rbsp_buffer, &rbsp->rbsp_buffer_alloc_size, src_length); - if (!rbsp->rbsp_buffer) - return AVERROR(ENOMEM); - rbsp->rbsp_buffer_size = 0; + av_fast_padded_malloc(&rbsp->rbsp_buffer, &rbsp->rbsp_buffer_alloc_size, src_length); + if (!rbsp->rbsp_buffer) + return AVERROR(ENOMEM); + rbsp->rbsp_buffer_size = 0; consumed = ff_h2645_extract_rbsp(buf + buf_index, src_length, rbsp, &nal, 1); if (consumed < 0) @@ -364,31 +364,31 @@ static inline int parse_nal_units(AVCodecParserContext *s, } if (p->ps.pps != (const PPS*)p->ps.pps_list[pps_id]->data) { - av_buffer_unref(&p->ps.pps_ref); - p->ps.pps_ref = av_buffer_ref(p->ps.pps_list[pps_id]); - if (!p->ps.pps_ref) { - p->ps.pps = NULL; - goto unref_sps; - } - p->ps.pps = (const PPS*)p->ps.pps_ref->data; + av_buffer_unref(&p->ps.pps_ref); + p->ps.pps_ref = av_buffer_ref(p->ps.pps_list[pps_id]); + if (!p->ps.pps_ref) { + p->ps.pps = NULL; + goto unref_sps; + } + 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); unref_sps: - av_buffer_unref(&p->ps.sps_ref); - p->ps.sps = NULL; + av_buffer_unref(&p->ps.sps_ref); + p->ps.sps = NULL; goto fail; } if (p->ps.sps != (const SPS*)p->ps.sps_list[p->ps.pps->sps_id]->data) { - av_buffer_unref(&p->ps.sps_ref); - p->ps.sps_ref = av_buffer_ref(p->ps.sps_list[p->ps.pps->sps_id]); - if (!p->ps.sps_ref) { - p->ps.sps = NULL; - goto fail; - } - p->ps.sps = (const SPS*)p->ps.sps_ref->data; + av_buffer_unref(&p->ps.sps_ref); + p->ps.sps_ref = av_buffer_ref(p->ps.sps_list[p->ps.pps->sps_id]); + if (!p->ps.sps_ref) { + p->ps.sps = NULL; + goto fail; + } + p->ps.sps = (const SPS*)p->ps.sps_ref->data; } sps = p->ps.sps; -- 2.21.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".