ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@gmail.com> | Mon Dec 7 00:41:25 2020 +0100| [e0e9c94c2b51a3512b9a035a2dd9a5a399c68702] | committer: Andreas Rheinhardt
avformat/hashenc: Reuse hash_free() for framehash muxers Reviewed-by: Paul B Mahol <one...@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0e9c94c2b51a3512b9a035a2dd9a5a399c68702 --- libavformat/hashenc.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c index ce609f6efa..5523dfd1cd 100644 --- a/libavformat/hashenc.c +++ b/libavformat/hashenc.c @@ -156,6 +156,7 @@ static int hash_write_trailer(struct AVFormatContext *s) return 0; } +#endif static void hash_free(struct AVFormatContext *s) { @@ -168,7 +169,6 @@ static void hash_free(struct AVFormatContext *s) } av_freep(&c->hashes); } -#endif #if CONFIG_HASH_MUXER static const AVClass hashenc_class = { @@ -326,14 +326,6 @@ static int framehash_write_packet(struct AVFormatContext *s, AVPacket *pkt) avio_printf(s->pb, "\n"); return 0; } - -static void framehash_free(struct AVFormatContext *s) -{ - struct HashContext *c = s->priv_data; - if (c->hashes) - av_hash_freep(&c->hashes[0]); - av_freep(&c->hashes); -} #endif #if CONFIG_FRAMEHASH_MUXER @@ -353,7 +345,7 @@ AVOutputFormat ff_framehash_muxer = { .init = framehash_init, .write_header = framehash_write_header, .write_packet = framehash_write_packet, - .deinit = framehash_free, + .deinit = hash_free, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | AVFMT_TS_NEGATIVE, .priv_class = &framehash_class, @@ -377,7 +369,7 @@ AVOutputFormat ff_framemd5_muxer = { .init = framehash_init, .write_header = framehash_write_header, .write_packet = framehash_write_packet, - .deinit = framehash_free, + .deinit = hash_free, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | AVFMT_TS_NEGATIVE, .priv_class = &framemd5_class, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
