diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-22 19:51:36 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-22 19:51:36 +0200 |
| commit | 541e1c2c3b7cf11c6c504dc03cd9b0559dfff3df (patch) | |
| tree | c322202e0a64f71aee2d039e6a6c28799f4d790b | |
| parent | 93f5a27313af2872713b39616c1eb9eb1c3b6415 (diff) | |
| parent | 31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3 (diff) | |
| download | ffmpeg-541e1c2c3b7cf11c6c504dc03cd9b0559dfff3df.tar.gz | |
Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'
* commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3':
lavc: mark the old audio/video encoding API as deprecated
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 682aa35e57..e3c9bcb0d8 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5205,7 +5205,10 @@ AVCodec *avcodec_find_encoder_by_name(const char *name); * value of got_packet_ptr is undefined and should * not be used. * @return 0 on success, negative error code on failure + * + * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead */ +attribute_deprecated int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr); @@ -5241,7 +5244,10 @@ int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt, * value of got_packet_ptr is undefined and should * not be used. * @return 0 on success, negative error code on failure + * + * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead */ +attribute_deprecated int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr); |