This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit c29d1b9df58358a7349780c8daab7e62d837a75e Author: Andreas Rheinhardt <[email protected]> AuthorDate: Mon May 11 16:57:42 2026 +0200 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue May 12 16:12:54 2026 +0200 avformat/id3v2: Fix indentation Forgotten after e9c372362cb736240dcd87658a027ecfb7b9d240. Reviewed-by: Romain Beauxis <[email protected]> Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavformat/id3v2.c | 54 ++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 590eca11bf..b06b680f91 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -1020,40 +1020,40 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, } #if CONFIG_ZLIB - if (tcomp) { - int err; + if (tcomp) { + int err; - av_log(s, AV_LOG_DEBUG, "Compressed frame %s tlen=%d dlen=%ld\n", tag, tlen, dlen); + av_log(s, AV_LOG_DEBUG, "Compressed frame %s tlen=%d dlen=%ld\n", tag, tlen, dlen); - if (tlen <= 0) - goto seek; - if (dlen / 32768 > tlen) - goto seek; - - av_fast_malloc(&uncompressed_buffer, &uncompressed_buffer_size, dlen); - if (!uncompressed_buffer) { - av_log(s, AV_LOG_ERROR, "Failed to alloc %ld bytes\n", dlen); - goto seek; - } + if (tlen <= 0) + goto seek; + if (dlen / 32768 > tlen) + goto seek; - if (!(unsync || tunsync)) { - err = avio_read(pb, buffer, tlen); - if (err < 0) { - av_log(s, AV_LOG_ERROR, "Failed to read compressed tag\n"); - goto seek; - } - tlen = err; - } + av_fast_malloc(&uncompressed_buffer, &uncompressed_buffer_size, dlen); + if (!uncompressed_buffer) { + av_log(s, AV_LOG_ERROR, "Failed to alloc %ld bytes\n", dlen); + goto seek; + } - err = uncompress(uncompressed_buffer, &dlen, buffer, tlen); - if (err != Z_OK) { - av_log(s, AV_LOG_ERROR, "Failed to uncompress tag: %d\n", err); + if (!(unsync || tunsync)) { + err = avio_read(pb, buffer, tlen); + if (err < 0) { + av_log(s, AV_LOG_ERROR, "Failed to read compressed tag\n"); goto seek; } - ffio_init_read_context(&pb_local, uncompressed_buffer, dlen); - tlen = dlen; - pbx = &pb_local.pub; // read from sync buffer + tlen = err; } + + err = uncompress(uncompressed_buffer, &dlen, buffer, tlen); + if (err != Z_OK) { + av_log(s, AV_LOG_ERROR, "Failed to uncompress tag: %d\n", err); + goto seek; + } + ffio_init_read_context(&pb_local, uncompressed_buffer, dlen); + tlen = dlen; + pbx = &pb_local.pub; // read from sync buffer + } #endif if (s && (s->debug & FF_FDEBUG_ID3V2)) { int64_t pos = avio_tell(pbx); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
