diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-06-24 18:51:58 +0300 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-01 22:39:54 +0300 |
commit | fd6cb26583700c4ea294ac367dcfe3c777624dca (patch) | |
tree | 636d2f276bff15d185ec14c344cc161e38231607 /libavformat/avc.h | |
parent | 847bb1d5226af1cbe85bc09527f4cc25389aad7d (diff) |
avformat/avc, mxfenc: Avoid allocation of H264 SPS structure, fix memleak
Up until now, ff_avc_decode_sps would parse a SPS and return some
properties from it in a freshly allocated structure. Yet said structure
is very small and completely internal to libavformat, so there is no
reason to use the heap for it. This commit therefore changes the
function to return an int and to modify a caller-provided structure.
This will also allow ff_avc_decode_sps to return better error codes in
the future.
It also fixes a memleak in mxfenc: If a packet contained multiple SPS,
only the SPS structure belonging to the last SPS would be freed, the
other ones would leak when the pointer is overwritten to point to the
new SPS structure. Of course, without allocations there are no leaks.
This is Coverity issue #1445194.
Furthermore, the SPS structure has been renamed from
H264SequenceParameterSet to H264SPS in order to avoid overlong lines.
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit a0b6df0a3953e2586e63f513485c4d2d42507d7f)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat/avc.h')
-rw-r--r-- | libavformat/avc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avc.h b/libavformat/avc.h index a79bf9b2db..f75d7a9c72 100644 --- a/libavformat/avc.h +++ b/libavformat/avc.h @@ -45,8 +45,8 @@ typedef struct { uint8_t bit_depth_luma; uint8_t frame_mbs_only_flag; AVRational sar; -} H264SequenceParameterSet; +} H264SPS; -H264SequenceParameterSet *ff_avc_decode_sps(const uint8_t *src, int src_len); +int ff_avc_decode_sps(H264SPS *sps, const uint8_t *buf, int buf_size); #endif /* AVFORMAT_AVC_H */ |