diff options
| author | James Almer <jamrial@gmail.com> | 2015-07-21 00:40:09 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-07-21 13:03:29 -0300 |
| commit | d32547a24a3fcc8286b318353f43805838b84775 (patch) | |
| tree | 817b8ffcb8443761569090e60f78c15587666b74 | |
| parent | 3e46c7dbbeb02bdbcc8813440ca570a5f9eeba48 (diff) | |
| download | ffmpeg-d32547a24a3fcc8286b318353f43805838b84775.tar.gz | |
avcodec/utils: silence some deprecation warnings
And prevent eventual compilation failures once the relevant functions
and fields are removed.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/utils.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 16601dd965..d926a2631a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2090,10 +2090,15 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx, got_packet = 0; ret = avcodec_encode_audio2(avctx, &pkt, frame, &got_packet); +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS if (!ret && got_packet && avctx->coded_frame) { avctx->coded_frame->pts = pkt.pts; avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY); } +FF_ENABLE_DEPRECATION_WARNINGS +#endif + /* free any side data since we cannot return it */ av_packet_free_side_data(&pkt); @@ -2123,10 +2128,14 @@ int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf pkt.size = buf_size; ret = avcodec_encode_video2(avctx, &pkt, pict, &got_packet); +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS if (!ret && got_packet && avctx->coded_frame) { avctx->coded_frame->pts = pkt.pts; avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY); } +FF_ENABLE_DEPRECATION_WARNINGS +#endif /* free any side data since we cannot return it */ if (pkt.side_data_elems > 0) { @@ -2492,6 +2501,8 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa if (!frame) return AVERROR(ENOMEM); +#if FF_API_GET_BUFFER +FF_DISABLE_DEPRECATION_WARNINGS if (avctx->get_buffer != avcodec_default_get_buffer) { av_log(avctx, AV_LOG_ERROR, "Custom get_buffer() for use with" "avcodec_decode_audio3() detected. Overriding with avcodec_default_get_buffer\n"); @@ -2500,6 +2511,8 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa avctx->get_buffer = avcodec_default_get_buffer; avctx->release_buffer = avcodec_default_release_buffer; } +FF_ENABLE_DEPRECATION_WARNINGS +#endif ret = avcodec_decode_audio4(avctx, frame, &got_frame, avpkt); |