diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-11 17:47:29 +0200 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-12 13:38:31 +0200 |
commit | 6064f697a321174232a3fad351afb21150c3e9e5 (patch) | |
tree | aa83e7afc13097a44bdfadebda3bcb4bff3d1a62 /libavcodec/flacenc.c | |
parent | 1e0b8bf0b3b3b4247fb21e9839af342ae879607c (diff) | |
download | ffmpeg-6064f697a321174232a3fad351afb21150c3e9e5.tar.gz |
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 <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/flacenc.c')
-rw-r--r-- | libavcodec/flacenc.c | 6 |
1 files changed, 6 insertions, 0 deletions
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) |