Merge remote branch 'qatar/master'

[ffmpeg] / libpostproc / postprocess.h

diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h
index 1803959cd366a95011aa7c9f145f8abbc8a91850..0713c479562b1ee3bd11c971bed45ee7c620e364 100644 (file)
--- a/libpostproc/postprocess.h
+++ b/libpostproc/postprocess.h
@@ -18,55 +18,80 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_POSTPROCESS_H
-#define FFMPEG_POSTPROCESS_H
+#ifndef POSTPROC_POSTPROCESS_H
+#define POSTPROC_POSTPROCESS_H
 
 /**
- * @file postprocess.h
+ * @file
  * @brief
- *     external api for the pp stuff
+ *     external postprocessing API
  */
 
-#define LIBPOSTPROC_VERSION_TRIPLET 51,1,0
+#include "libavutil/avutil.h"
 
-#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_TRIPLET)
-#define LIBPOSTPROC_VERSION     AV_VERSION(LIBPOSTPROC_VERSION_TRIPLET)
+#define LIBPOSTPROC_VERSION_MAJOR 51
+#define LIBPOSTPROC_VERSION_MINOR  2
+#define LIBPOSTPROC_VERSION_MICRO  0
+
+#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
+                                               LIBPOSTPROC_VERSION_MINOR, \
+                                               LIBPOSTPROC_VERSION_MICRO)
+#define LIBPOSTPROC_VERSION     AV_VERSION(LIBPOSTPROC_VERSION_MAJOR, \
+                                           LIBPOSTPROC_VERSION_MINOR, \
+                                           LIBPOSTPROC_VERSION_MICRO)
 #define LIBPOSTPROC_BUILD       LIBPOSTPROC_VERSION_INT
 
 #define LIBPOSTPROC_IDENT       "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
 
+/**
+ * Return the LIBPOSTPROC_VERSION_INT constant.
+ */
+unsigned postproc_version(void);
+
+/**
+ * Return the libpostproc build-time configuration.
+ */
+const char *postproc_configuration(void);
+
+/**
+ * Return the libpostproc license.
+ */
+const char *postproc_license(void);
+
 #define PP_QUALITY_MAX 6
 
 #define QP_STORE_T int8_t
 
 #include <inttypes.h>
 
-typedef void pp_context_t;
-typedef void pp_mode_t;
+typedef void pp_context;
+typedef void pp_mode;
 
 #if LIBPOSTPROC_VERSION_INT < (52<<16)
+typedef pp_context pp_context_t;
+typedef pp_mode pp_mode_t;
 extern const char *const pp_help; ///< a simple help text
 #else
 extern const char pp_help[]; ///< a simple help text
 #endif
 
 void  pp_postprocess(const uint8_t * src[3], const int srcStride[3],
-                 uint8_t * dst[3], const int dstStride[3],
-                 int horizontalSize, int verticalSize,
-                 const QP_STORE_T *QP_store,  int QP_stride,
-                 pp_mode_t *mode, pp_context_t *ppContext, int pict_type);
+                     uint8_t * dst[3], const int dstStride[3],
+                     int horizontalSize, int verticalSize,
+                     const QP_STORE_T *QP_store,  int QP_stride,
+                     pp_mode *mode, pp_context *ppContext, int pict_type);
 
 
 /**
- * returns a pp_mode_t or NULL if an error occured
+ * returns a pp_mode or NULL if an error occurred
  * name is the string after "-pp" on the command line
  * quality is a number from 0 to PP_QUALITY_MAX
  */
-pp_mode_t *pp_get_mode_by_name_and_quality(const char *name, int quality);
-void pp_free_mode(pp_mode_t *mode);
+pp_mode *pp_get_mode_by_name_and_quality(const char *name, int quality);
+void pp_free_mode(pp_mode *mode);
 
-pp_context_t *pp_get_context(int width, int height, int flags);
-void pp_free_context(pp_context_t *ppContext);
+pp_context *pp_get_context(int width, int height, int flags);
+void pp_free_context(pp_context *ppContext);
 
 #define PP_CPU_CAPS_MMX   0x80000000
 #define PP_CPU_CAPS_MMX2  0x20000000
@@ -81,4 +106,4 @@ void pp_free_context(pp_context_t *ppContext);
 
 #define PP_PICT_TYPE_QP2  0x00000010 ///< MPEG2 style QScale
 
-#endif /* FFMPEG_POSTPROCESS_H */
+#endif /* POSTPROC_POSTPROCESS_H */