diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 22:12:27 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 22:15:57 +0300 |
commit | 76cac7ed45fbb67edfb8c296798b6b83466d66f7 (patch) | |
tree | 928dd7376f0ea192604763c867153d3e3d1b9bea /libavcodec/utils.c | |
parent | 64c33f9624eeed375e7a73fba46700d7ba18adc8 (diff) |
avcodec: remove deprecated old video encode API
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 549e579504..0b8b5a73a8 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1813,48 +1813,6 @@ end: return ret; } -#if FF_API_OLD_ENCODE_VIDEO -int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size, - const AVFrame *pict) -{ - AVPacket pkt; - int ret, got_packet = 0; - - if (buf_size < AV_INPUT_BUFFER_MIN_SIZE) { - av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n"); - return -1; - } - - av_init_packet(&pkt); - pkt.data = 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); - if (avctx->codec->capabilities & AV_CODEC_CAP_INTRA_ONLY) - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - - /* free any side data since we cannot return it */ - if (pkt.side_data_elems > 0) { - int i; - for (i = 0; i < pkt.side_data_elems; i++) - av_free(pkt.side_data[i].data); - av_freep(&pkt.side_data); - pkt.side_data_elems = 0; - } - - return ret ? ret : pkt.size; -} - -#endif - int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, |