diff options
| -rw-r--r-- | doc/APIchanges | 5 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 10 | ||||
| -rw-r--r-- | libavcodec/utils.c | 8 |
3 files changed, 20 insertions, 3 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 265d6d5..e99c7e6 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,8 +14,9 @@ libavutil: 2015-08-28 API changes, most recent first: -2015-12-17 - xxxxxxx - lavc 57.18.100 / 57.11.0 - avcodec.h - Add av_packet_add_side_data(). +2015-12-17 - lavc 57.18.100 / 57.11.0 - avcodec.h + xxxxxxx - Add av_packet_add_side_data(). + xxxxxxx - Add AVCodecContext.coded_side_data. 2015-12-11 - xxxxxxx - lavf 57.20.100 - avformat.h Add av_program_add_stream_index() diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a60d28c..2821286 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3301,6 +3301,16 @@ typedef struct AVCodecContext { unsigned properties; #define FF_CODEC_PROPERTY_LOSSLESS 0x00000001 #define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002 + + /** + * Additional data associated with the entire coded stream. + * + * - decoding: unused + * - encoding: may be set by libavcodec after avcodec_open2(). + */ + AVPacketSideData *coded_side_data; + int nb_coded_side_data; + } AVCodecContext; AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 94ec2f6..b039885 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2507,12 +2507,13 @@ void avsubtitle_free(AVSubtitle *sub) av_cold int avcodec_close(AVCodecContext *avctx) { + int i; + if (!avctx) return 0; if (avcodec_is_open(avctx)) { FramePool *pool = avctx->internal->pool; - int i; if (CONFIG_FRAME_THREAD_ENCODER && avctx->internal->frame_thread_encoder && avctx->thread_count > 1) { ff_frame_thread_encoder_free(avctx); @@ -2535,6 +2536,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); |
