diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
| commit | 1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch) | |
| tree | 89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/libpostproc/postprocess.h | |
| parent | 09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff) | |
| download | xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2 | |
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/libpostproc/postprocess.h')
| -rw-r--r-- | contrib/ffmpeg/libpostproc/postprocess.h | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/contrib/ffmpeg/libpostproc/postprocess.h b/contrib/ffmpeg/libpostproc/postprocess.h index eed92ba6d..818fb41ba 100644 --- a/contrib/ffmpeg/libpostproc/postprocess.h +++ b/contrib/ffmpeg/libpostproc/postprocess.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef NEWPOSTPROCESS_H -#define NEWPOSTPROCESS_H +#ifndef FFMPEG_POSTPROCESS_H +#define FFMPEG_POSTPROCESS_H /** * @file postprocess.h @@ -27,12 +27,18 @@ * external api for the pp stuff */ -#ifdef __cplusplus -extern "C" { -#endif +#include "libavutil/avutil.h" + +#define LIBPOSTPROC_VERSION_MAJOR 51 +#define LIBPOSTPROC_VERSION_MINOR 1 +#define LIBPOSTPROC_VERSION_MICRO 0 -#define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0) -#define LIBPOSTPROC_VERSION 51.1.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) @@ -41,15 +47,21 @@ extern "C" { #define QP_STORE_T int8_t +#include <inttypes.h> + typedef void pp_context_t; typedef void pp_mode_t; -extern char *pp_help; ///< a simple help text +#if LIBPOSTPROC_VERSION_INT < (52<<16) +extern const char *const pp_help; ///< a simple help text +#else +extern const char pp_help[]; ///< a simple help text +#endif -void pp_postprocess(uint8_t * src[3], int srcStride[3], - uint8_t * dst[3], int dstStride[3], +void pp_postprocess(const uint8_t * src[3], const int srcStride[3], + uint8_t * dst[3], const int dstStride[3], int horizontalSize, int verticalSize, - QP_STORE_T *QP_store, int QP_stride, + const QP_STORE_T *QP_store, int QP_stride, pp_mode_t *mode, pp_context_t *ppContext, int pict_type); @@ -58,7 +70,7 @@ void pp_postprocess(uint8_t * src[3], int srcStride[3], * 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(char *name, int quality); +pp_mode_t *pp_get_mode_by_name_and_quality(const char *name, int quality); void pp_free_mode(pp_mode_t *mode); pp_context_t *pp_get_context(int width, int height, int flags); @@ -77,8 +89,4 @@ void pp_free_context(pp_context_t *ppContext); #define PP_PICT_TYPE_QP2 0x00000010 ///< MPEG2 style QScale -#ifdef __cplusplus -} -#endif - -#endif +#endif /* FFMPEG_POSTPROCESS_H */ |