[FFmpeg-cvslog] Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Jun 22 19:51:36 2016 +0200| [541e1c2c3b7cf11c6c504dc03cd9b0559dfff3df] | committer: Clément Bœsch

Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'

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

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=541e1c2c3b7cf11c6c504dc03cd9b0559dfff3df
---

 libavcodec/avcodec.h |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 682aa35..e3c9bcb 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);
 


======================================================================