summaryrefslogtreecommitdiff
path: root/libavcodec/vda.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-02-23 08:20:12 +0100
committerAnton Khirnov <anton@khirnov.net>2013-03-09 08:37:11 +0100
commitadfa53d67c7a3318157ea9d95e8bdcfb77139452 (patch)
tree3f2e43a5b63396770d23019d3ff261e8f5bb5628 /libavcodec/vda.h
parentbdd1567c355a8092e7746ef99e831d579e34fa6a (diff)
lavc: remove disabled FF_API_VDA_ASYNC cruft
Diffstat (limited to 'libavcodec/vda.h')
-rw-r--r--libavcodec/vda.h75
1 files changed, 0 insertions, 75 deletions
diff --git a/libavcodec/vda.h b/libavcodec/vda.h
index f0ec2bfec3..987b94f1fa 100644
--- a/libavcodec/vda.h
+++ b/libavcodec/vda.h
@@ -31,10 +31,6 @@
#include "libavcodec/version.h"
-#if FF_API_VDA_ASYNC
-#include <pthread.h>
-#endif
-
#include <stdint.h>
// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
@@ -52,39 +48,6 @@
* @{
*/
-#if FF_API_VDA_ASYNC
-/**
- * This structure is used to store decoded frame information and data.
- *
- * @deprecated Use synchronous decoding mode.
- */
-typedef struct vda_frame {
- /**
- * The PTS of the frame.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- int64_t pts;
-
- /**
- * The CoreVideo buffer that contains the decoded data.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- CVPixelBufferRef cv_buffer;
-
- /**
- * A pointer to the next frame.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- struct vda_frame *next_frame;
-} vda_frame;
-#endif
-
/**
* This structure is used to provide the necessary configurations and data
* to the VDA Libav HWAccel implementation.
@@ -116,28 +79,6 @@ struct vda_context {
*/
int use_sync_decoding;
-#if FF_API_VDA_ASYNC
- /**
- * VDA frames queue ordered by presentation timestamp.
- *
- * @deprecated Use synchronous decoding mode.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- vda_frame *queue;
-
- /**
- * Mutex for locking queue operations.
- *
- * @deprecated Use synchronous decoding mode.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- pthread_mutex_t queue_mutex;
-#endif
-
/**
* The frame width.
*
@@ -194,22 +135,6 @@ int ff_vda_create_decoder(struct vda_context *vda_ctx,
/** Destroy the video decoder. */
int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
-#if FF_API_VDA_ASYNC
-/**
- * Return the top frame of the queue.
- *
- * @deprecated Use synchronous decoding mode.
- */
-vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
-
-/**
- * Release the given frame.
- *
- * @deprecated Use synchronous decoding mode.
- */
-void ff_vda_release_vda_frame(vda_frame *frame);
-#endif
-
/**
* @}
*/