diff options
author | Anton Khirnov <anton@khirnov.net> | 2015-07-22 14:39:30 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2015-12-06 10:22:43 +0100 |
commit | 84adab333cddeefc3cfd843089dee23f58bd372c (patch) | |
tree | cb4f38148747f6f6490e301301d50b4ceda2bdca /libavcodec/utils.c | |
parent | 31c51f7441de07b88cfea2550245bf1f5140cb8f (diff) | |
download | ffmpeg-streaming-84adab333cddeefc3cfd843089dee23f58bd372c.zip ffmpeg-streaming-84adab333cddeefc3cfd843089dee23f58bd372c.tar.gz |
lavc: add stream-global packet side data
This is similar to what is done for AVStream.
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index ad00a92..f3361a0 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1603,9 +1603,11 @@ void avsubtitle_free(AVSubtitle *sub) av_cold int avcodec_close(AVCodecContext *avctx) { + int i; + if (avcodec_is_open(avctx)) { FramePool *pool = avctx->internal->pool; - int i; + if (HAVE_THREADS && avctx->internal->thread_ctx) ff_thread_free(avctx); if (avctx->codec && avctx->codec->close) @@ -1622,6 +1624,11 @@ av_cold int avcodec_close(AVCodecContext *avctx) av_freep(&avctx->internal); } + for (i = 0; i < avctx->nb_coded_side_data; i++) + av_freep(&avctx->coded_side_data[i].data); + av_freep(&avctx->coded_side_data); + avctx->nb_coded_side_data = 0; + if (avctx->priv_data && avctx->codec && avctx->codec->priv_class) av_opt_free(avctx->priv_data); av_opt_free(avctx); |