diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 15:12:05 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 15:12:05 +0200 |
| commit | 580c4fc98a213ff56ec95f95c30dde81cb7ef46c (patch) | |
| tree | e540b1dbb8df192953f6f4e1e91fefefc001212d /libavcodec/flacenc.c | |
| parent | 141637002767d47154bffaf1463edcfd9445a5ee (diff) | |
| parent | 6064f697a321174232a3fad351afb21150c3e9e5 (diff) | |
Merge commit '6064f697a321174232a3fad351afb21150c3e9e5'
* commit '6064f697a321174232a3fad351afb21150c3e9e5':
lavc: Enable side data only packets by default
Merged-by: Hendrik Leppkes <h.leppkes@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 be791b39df..f849ffcca4 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1346,7 +1346,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) |