diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-25 20:15:20 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:04 -0300 |
| commit | cb172ae9abf465093a607fe216d40c84f677b209 (patch) | |
| tree | adacf32f7b9864deb35c2b4720655462dc01d663 /libavcodec | |
| parent | b7473ffbf5c240ded6a9a6c53c006cc0dd4af93c (diff) | |
| download | ffmpeg-cb172ae9abf465093a607fe216d40c84f677b209.tar.gz | |
avcodec/mpegvideo_enc: Remove deprecated RTP-callback
Deprecated in 462a54e2291e1fa18e1f1254d09739dfbb795617.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 14 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 21 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 38 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 69f69a1aa4..064af12f31 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1387,20 +1387,6 @@ typedef struct AVCodecContext { */ int trellis; -#if FF_API_RTP_CALLBACK - /** - * @deprecated unused - */ - /* The RTP callback: This function is called */ - /* every time the encoder has a packet to send. */ - /* It depends on the encoder if the data starts */ - /* with a Start Code (it should). H.263 does. */ - /* mb_nb contains the number of macroblocks */ - /* encoded in the RTP payload. */ - attribute_deprecated - void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb); -#endif - /** * pass1 encoding statistics output buffer * - encoding: Set by libavcodec. diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index a98b9ed73c..c4fd6f293a 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2946,14 +2946,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ } } -#if FF_API_RTP_CALLBACK -FF_DISABLE_DEPRECATION_WARNINGS - if (s->avctx->rtp_callback){ - int number_mb = (mb_y - s->resync_mb_y)*s->mb_width + mb_x - s->resync_mb_x; - s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, current_packet_size, number_mb); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif update_mb_info(s, 1); switch(s->codec_id){ @@ -3429,19 +3421,6 @@ FF_ENABLE_DEPRECATION_WARNINGS write_slice_end(s); -#if FF_API_RTP_CALLBACK -FF_DISABLE_DEPRECATION_WARNINGS - /* Send the last GOB if RTP */ - if (s->avctx->rtp_callback) { - int number_mb = (mb_y - s->resync_mb_y)*s->mb_width - s->resync_mb_x; - int pdif = put_bits_ptr(&s->pb) - s->ptr_lastgob; - /* Call the RTP callback to send the last GOB */ - emms_c(); - s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, number_mb); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return 0; } diff --git a/libavcodec/version.h b/libavcodec/version.h index 376e4b21dc..601eba84db 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -60,9 +60,6 @@ #ifndef FF_API_AVPICTURE #define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_RTP_CALLBACK -#define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_VBV_DELAY #define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) #endif |