diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-28 14:30:24 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-08-28 16:01:16 +0200 |
| commit | 9f90b24877016e7140b9b14e4b1acee663bb6d8a (patch) | |
| tree | 0f9ff174759bb67a12a749a27705ac10151cf8b6 /libavcodec/pthread_frame.c | |
| parent | 01bcc2d5c23fa757d163530abb396fd02f1be7c8 (diff) | |
lavc: Drop deprecated get_buffer related functions
Deprecated in 11/2012.
Diffstat (limited to 'libavcodec/pthread_frame.c')
| -rw-r--r-- | libavcodec/pthread_frame.c | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 64b8aa552f..c72da533aa 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -242,12 +242,6 @@ static int update_context_from_user(AVCodecContext *dst, AVCodecContext *src) dst->draw_horiz_band= src->draw_horiz_band; dst->get_buffer2 = src->get_buffer2; -#if FF_API_GET_BUFFER -FF_DISABLE_DEPRECATION_WARNINGS - dst->get_buffer = src->get_buffer; - dst->release_buffer = src->release_buffer; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->opaque = src->opaque; dst->debug = src->debug; @@ -340,13 +334,8 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt) * and it calls back to the client here. */ -FF_DISABLE_DEPRECATION_WARNINGS - if (!p->avctx->thread_safe_callbacks && ( -#if FF_API_GET_BUFFER - p->avctx->get_buffer || -#endif - p->avctx->get_buffer2 != avcodec_default_get_buffer2)) { -FF_ENABLE_DEPRECATION_WARNINGS + if (!p->avctx->thread_safe_callbacks && + p->avctx->get_buffer2 != avcodec_default_get_buffer2) { while (p->state != STATE_SETUP_FINISHED && p->state != STATE_INPUT_READY) { pthread_mutex_lock(&p->progress_mutex); while (p->state == STATE_SETTING_UP) @@ -728,13 +717,8 @@ int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) } pthread_mutex_lock(&p->parent->buffer_mutex); -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->thread_safe_callbacks || ( -#if FF_API_GET_BUFFER - !avctx->get_buffer && -#endif - avctx->get_buffer2 == avcodec_default_get_buffer2)) { -FF_ENABLE_DEPRECATION_WARNINGS + if (avctx->thread_safe_callbacks || + avctx->get_buffer2 == avcodec_default_get_buffer2) { err = ff_get_buffer(avctx, f->f, flags); } else { p->requested_frame = f->f; @@ -767,15 +751,9 @@ void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f) PerThreadContext *p = avctx->internal->thread_ctx; FrameThreadContext *fctx; AVFrame *dst, *tmp; -FF_DISABLE_DEPRECATION_WARNINGS int can_direct_free = !(avctx->active_thread_type & FF_THREAD_FRAME) || avctx->thread_safe_callbacks || - ( -#if FF_API_GET_BUFFER - !avctx->get_buffer && -#endif - avctx->get_buffer2 == avcodec_default_get_buffer2); -FF_ENABLE_DEPRECATION_WARNINGS + avctx->get_buffer2 == avcodec_default_get_buffer2; if (!f->f || !f->f->buf[0]) return; |