Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / vda.h

diff --git a/libavcodec/vda.h b/libavcodec/vda.h
index 5ff8070fd368a286d884f90c17d610782106168c..6e9de9cd0a46bf7f8512563d5a8f709ddac29b52 100644 (file)
--- a/libavcodec/vda.h
+++ b/libavcodec/vda.h
@@ -23,6 +23,7 @@
 #ifndef AVCODEC_VDA_H
 #define AVCODEC_VDA_H
 
+#include <pthread.h>
 #include <stdint.h>
 
 // emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
@@ -60,7 +61,6 @@ typedef struct {
     * - decoding: Set/Unset by libavcodec.
     */
     struct vda_frame    *next_frame;
-
 } vda_frame;
 
 /**
@@ -92,7 +92,7 @@ struct vda_context {
     * - encoding: unused
     * - decoding: Set/Unset by libavcodec.
     */
-    void                *queue_mutex;
+    pthread_mutex_t     queue_mutex;
 
     /**
     * The frame width.
@@ -151,18 +151,18 @@ struct vda_context {
     int                 ref_size;
 };
 
-/** Creates the video decoder. */
+/** Create the video decoder. */
 int ff_vda_create_decoder(struct vda_context *vda_ctx,
                           uint8_t *extradata,
                           int extradata_size);
 
-/** Destroys the video decoder. */
+/** Destroy the video decoder. */
 int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
 
-/** Returns the top frame of the queue. */
+/** Return the top frame of the queue. */
 vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
 
-/** Releases the given frame. */
+/** Release the given frame. */
 void ff_vda_release_vda_frame(vda_frame *frame);
 
 #endif /* AVCODEC_VDA_H */