mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-30 20:16:42 +08:00
Merge commit '6064f697a321174232a3fad351afb21150c3e9e5'
* commit '6064f697a321174232a3fad351afb21150c3e9e5': lavc: Enable side data only packets by default Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user