Merge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'

[ffmpeg] / libavcodec / vda_internal.h

diff --git a/libavcodec/vda_internal.h b/libavcodec/vda_internal.h
index df7305bfe64b9383a2c161ab78c973ba214ce991..457916b05885430b97dd02de3b80d0b74ab6c02c 100644 (file)
--- a/libavcodec/vda_internal.h
+++ b/libavcodec/vda_internal.h
@@ -1,8 +1,4 @@
 /*
- * VDA HW acceleration
- *
- * copyright (c) 2011 Sebastien Zwickert
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -25,18 +21,13 @@
 
 #include "vda.h"
 
-/**
- * \addtogroup VDA_Decoding
- *
- * @{
- */
-
-/** Send frame data to the hardware decoder. */
-int ff_vda_decoder_decode(struct vda_context *vda_ctx,
-                          uint8_t *bitstream,
-                          int bitstream_size,
-                          int64_t frame_pts);
+void ff_vda_output_callback(void *vda_hw_ctx,
+                            CFDictionaryRef user_info,
+                            OSStatus status,
+                            uint32_t infoFlags,
+                            CVImageBufferRef image_buffer);
 
-/* @} */
+int ff_vda_default_init(AVCodecContext *avctx);
+void ff_vda_default_free(AVCodecContext *avctx);
 
 #endif /* AVCODEC_VDA_INTERNAL_H */