mirror of https://git.ffmpeg.org/ffmpeg.git
Fix compilation errors when deprecated features are disabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
be656c362d
commit
ca2fd25988
|
@ -119,8 +119,13 @@ typedef struct FrameThreadContext {
|
||||||
int die; ///< Set when threads should exit.
|
int die; ///< Set when threads should exit.
|
||||||
} FrameThreadContext;
|
} FrameThreadContext;
|
||||||
|
|
||||||
|
#if FF_API_GET_BUFFER
|
||||||
#define THREAD_SAFE_CALLBACKS(avctx) \
|
#define THREAD_SAFE_CALLBACKS(avctx) \
|
||||||
((avctx)->thread_safe_callbacks || (!(avctx)->get_buffer && (avctx)->get_buffer2 == avcodec_default_get_buffer2))
|
((avctx)->thread_safe_callbacks || (!(avctx)->get_buffer && (avctx)->get_buffer2 == avcodec_default_get_buffer2))
|
||||||
|
#else
|
||||||
|
#define THREAD_SAFE_CALLBACKS(avctx) \
|
||||||
|
((avctx)->thread_safe_callbacks || (avctx)->get_buffer2 == avcodec_default_get_buffer2)
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Codec worker thread.
|
* Codec worker thread.
|
||||||
|
|
|
@ -1640,7 +1640,11 @@ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size)
|
||||||
av_fast_padded_malloc(&avctx->internal->byte_buffer, &avctx->internal->byte_buffer_size, size);
|
av_fast_padded_malloc(&avctx->internal->byte_buffer, &avctx->internal->byte_buffer_size, size);
|
||||||
avpkt->data = avctx->internal->byte_buffer;
|
avpkt->data = avctx->internal->byte_buffer;
|
||||||
avpkt->size = avctx->internal->byte_buffer_size;
|
avpkt->size = avctx->internal->byte_buffer_size;
|
||||||
|
#if FF_API_DESTRUCT_PACKET
|
||||||
|
FF_DISABLE_DEPRECATION_WARNINGS
|
||||||
avpkt->destruct = NULL;
|
avpkt->destruct = NULL;
|
||||||
|
FF_ENABLE_DEPRECATION_WARNINGS
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1812,7 +1816,11 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
|
||||||
}
|
}
|
||||||
avpkt->buf = user_pkt.buf;
|
avpkt->buf = user_pkt.buf;
|
||||||
avpkt->data = user_pkt.data;
|
avpkt->data = user_pkt.data;
|
||||||
|
#if FF_API_DESTRUCT_PACKET
|
||||||
|
FF_DISABLE_DEPRECATION_WARNINGS
|
||||||
avpkt->destruct = user_pkt.destruct;
|
avpkt->destruct = user_pkt.destruct;
|
||||||
|
FF_ENABLE_DEPRECATION_WARNINGS
|
||||||
|
#endif
|
||||||
} else {
|
} else {
|
||||||
if (av_dup_packet(avpkt) < 0) {
|
if (av_dup_packet(avpkt) < 0) {
|
||||||
ret = AVERROR(ENOMEM);
|
ret = AVERROR(ENOMEM);
|
||||||
|
@ -2013,7 +2021,11 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
|
||||||
}
|
}
|
||||||
avpkt->buf = user_pkt.buf;
|
avpkt->buf = user_pkt.buf;
|
||||||
avpkt->data = user_pkt.data;
|
avpkt->data = user_pkt.data;
|
||||||
|
#if FF_API_DESTRUCT_PACKET
|
||||||
|
FF_DISABLE_DEPRECATION_WARNINGS
|
||||||
avpkt->destruct = user_pkt.destruct;
|
avpkt->destruct = user_pkt.destruct;
|
||||||
|
FF_ENABLE_DEPRECATION_WARNINGS
|
||||||
|
#endif
|
||||||
} else {
|
} else {
|
||||||
if (av_dup_packet(avpkt) < 0) {
|
if (av_dup_packet(avpkt) < 0) {
|
||||||
ret = AVERROR(ENOMEM);
|
ret = AVERROR(ENOMEM);
|
||||||
|
|
Loading…
Reference in New Issue