virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'

Browse Source 
* commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3':
  lavc: mark the old audio/video encoding API as deprecated

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch
2016-06-22 19:51:36 +02:00
parent 93f5a27313 31f6a4b4b8
commit 541e1c2c3b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/avcodec.h
View File

@@ -5205,7 +5205,10 @@ AVCodec *avcodec_find_encoder_by_name(const char *name);
* value of got_packet_ptr is undefined and should * value of got_packet_ptr is undefined and should
* not be used. * not be used.
* @return 0 on success, negative error code on failure * @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, int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
const AVFrame *frame, int *got_packet_ptr); 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 * value of got_packet_ptr is undefined and should
* not be used. * not be used.
* @return 0 on success, negative error code on failure * @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, int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
const AVFrame *frame, int *got_packet_ptr); const AVFrame *frame, int *got_packet_ptr);