[FFmpeg-cvslog] avformat/imf: fix invalid resource handling
Pierre-Anthony Lemieux
git at videolan.org
Thu May 11 19:22:54 EEST 2023
ffmpeg | branch: master | Pierre-Anthony Lemieux <pal at palemieux.com> | Wed Apr 26 08:09:40 2023 -0700| [23d968d55a6e00dfc46799cfd0eb2ed02379037d] | committer: Pierre-Anthony Lemieux
avformat/imf: fix invalid resource handling
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23d968d55a6e00dfc46799cfd0eb2ed02379037d
---
libavformat/imf_cpl.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c
index ad84a68b13..a7cf5fa360 100644
--- a/libavformat/imf_cpl.c
+++ b/libavformat/imf_cpl.c
@@ -608,11 +608,10 @@ static int push_main_audio_sequence(xmlNodePtr audio_sequence_elem, FFIMFCPL *cp
ret = fill_trackfile_resource(resource_elem,
&vt->resources[vt->resource_count],
cpl);
- vt->resource_count++;
- if (ret) {
+ if (ret)
av_log(NULL, AV_LOG_ERROR, "Invalid Resource\n");
- continue;
- }
+ else
+ vt->resource_count++;
resource_elem = xmlNextElementSibling(resource_elem);
}
@@ -691,11 +690,10 @@ static int push_main_image_2d_sequence(xmlNodePtr image_sequence_elem, FFIMFCPL
ret = fill_trackfile_resource(resource_elem,
&cpl->main_image_2d_track->resources[cpl->main_image_2d_track->resource_count],
cpl);
- cpl->main_image_2d_track->resource_count++;
- if (ret) {
+ if (ret)
av_log(NULL, AV_LOG_ERROR, "Invalid Resource\n");
- continue;
- }
+ else
+ cpl->main_image_2d_track->resource_count++;
resource_elem = xmlNextElementSibling(resource_elem);
}
More information about the ffmpeg-cvslog
mailing list