From 6064f697a321174232a3fad351afb21150c3e9e5 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Fri, 11 Sep 2015 17:47:29 +0200 Subject: lavc: Enable side data only packets by default Deprecate the now unused option, but temporarily retain the capability to disable the now default behaviour. Mention this change in the AVPacket documentation. Signed-off-by: Vittorio Giovara --- libavcodec/flacenc.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libavcodec/flacenc.c') diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index c4c60ee573..58961b8dfa 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1214,7 +1214,13 @@ static int flac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, av_md5_final(s->md5ctx, s->md5sum); write_streaminfo(s, avctx->extradata); +#if FF_API_SIDEDATA_ONLY_PKT +FF_DISABLE_DEPRECATION_WARNINGS if (avctx->side_data_only_packets && !s->flushed) { +FF_ENABLE_DEPRECATION_WARNINGS +#else + if (!s->flushed) { +#endif uint8_t *side_data = av_packet_new_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, avctx->extradata_size); if (!side_data) -- cgit v1.2.3