Originally committed as revision 16062 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -634,7 +634,7 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, int stride, |
| 634 | 634 |
// minor note: the HAVE_xyz is messed up after that line so do not use it. |
| 635 | 635 |
|
| 636 | 636 |
static inline void postProcess(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, |
| 637 |
- const QP_STORE_T QPs[], int QPStride, int isColor, pp_mode_t *vm, pp_context_t *vc) |
|
| 637 |
+ const QP_STORE_T QPs[], int QPStride, int isColor, pp_mode *vm, pp_context *vc) |
|
| 638 | 638 |
{
|
| 639 | 639 |
PPContext *c= (PPContext *)vc; |
| 640 | 640 |
PPMode *ppMode= (PPMode *)vm; |
| ... | ... |
@@ -730,7 +730,7 @@ const char pp_help[] = |
| 730 | 730 |
"\n" |
| 731 | 731 |
; |
| 732 | 732 |
|
| 733 |
-pp_mode_t *pp_get_mode_by_name_and_quality(const char *name, int quality) |
|
| 733 |
+pp_mode *pp_get_mode_by_name_and_quality(const char *name, int quality) |
|
| 734 | 734 |
{
|
| 735 | 735 |
char temp[GET_MODE_BUFFER_SIZE]; |
| 736 | 736 |
char *p= temp; |
| ... | ... |
@@ -905,7 +905,7 @@ pp_mode_t *pp_get_mode_by_name_and_quality(const char *name, int quality) |
| 905 | 905 |
return ppMode; |
| 906 | 906 |
} |
| 907 | 907 |
|
| 908 |
-void pp_free_mode(pp_mode_t *mode){
|
|
| 908 |
+void pp_free_mode(pp_mode *mode){
|
|
| 909 | 909 |
av_free(mode); |
| 910 | 910 |
} |
| 911 | 911 |
|
| ... | ... |
@@ -947,7 +947,7 @@ static const char * context_to_name(void * ptr) {
|
| 947 | 947 |
|
| 948 | 948 |
static const AVClass av_codec_context_class = { "Postproc", context_to_name, NULL };
|
| 949 | 949 |
|
| 950 |
-pp_context_t *pp_get_context(int width, int height, int cpuCaps){
|
|
| 950 |
+pp_context *pp_get_context(int width, int height, int cpuCaps){
|
|
| 951 | 951 |
PPContext *c= av_malloc(sizeof(PPContext)); |
| 952 | 952 |
int stride= (width+15)&(~15); //assumed / will realloc if needed |
| 953 | 953 |
int qpStride= (width+15)/16 + 2; //assumed / will realloc if needed |
| ... | ... |
@@ -995,7 +995,7 @@ void pp_postprocess(const uint8_t * src[3], const int srcStride[3], |
| 995 | 995 |
uint8_t * dst[3], const int dstStride[3], |
| 996 | 996 |
int width, int height, |
| 997 | 997 |
const QP_STORE_T *QP_store, int QPStride, |
| 998 |
- pp_mode_t *vm, void *vc, int pict_type) |
|
| 998 |
+ pp_mode *vm, void *vc, int pict_type) |
|
| 999 | 999 |
{
|
| 1000 | 1000 |
int mbWidth = (width+15)>>4; |
| 1001 | 1001 |
int mbHeight= (height+15)>>4; |
| ... | ... |
@@ -54,8 +54,8 @@ unsigned postproc_version(void); |
| 54 | 54 |
|
| 55 | 55 |
#include <inttypes.h> |
| 56 | 56 |
|
| 57 |
-typedef void pp_context_t; |
|
| 58 |
-typedef void pp_mode_t; |
|
| 57 |
+typedef void pp_context; |
|
| 58 |
+typedef void pp_mode; |
|
| 59 | 59 |
|
| 60 | 60 |
#if LIBPOSTPROC_VERSION_INT < (52<<16) |
| 61 | 61 |
extern const char *const pp_help; ///< a simple help text |
| ... | ... |
@@ -67,19 +67,19 @@ void pp_postprocess(const uint8_t * src[3], const int srcStride[3], |
| 67 | 67 |
uint8_t * dst[3], const int dstStride[3], |
| 68 | 68 |
int horizontalSize, int verticalSize, |
| 69 | 69 |
const QP_STORE_T *QP_store, int QP_stride, |
| 70 |
- pp_mode_t *mode, pp_context_t *ppContext, int pict_type); |
|
| 70 |
+ pp_mode *mode, pp_context *ppContext, int pict_type); |
|
| 71 | 71 |
|
| 72 | 72 |
|
| 73 | 73 |
/** |
| 74 |
- * returns a pp_mode_t or NULL if an error occurred |
|
| 74 |
+ * returns a pp_mode or NULL if an error occurred |
|
| 75 | 75 |
* name is the string after "-pp" on the command line |
| 76 | 76 |
* quality is a number from 0 to PP_QUALITY_MAX |
| 77 | 77 |
*/ |
| 78 |
-pp_mode_t *pp_get_mode_by_name_and_quality(const char *name, int quality); |
|
| 79 |
-void pp_free_mode(pp_mode_t *mode); |
|
| 78 |
+pp_mode *pp_get_mode_by_name_and_quality(const char *name, int quality); |
|
| 79 |
+void pp_free_mode(pp_mode *mode); |
|
| 80 | 80 |
|
| 81 |
-pp_context_t *pp_get_context(int width, int height, int flags); |
|
| 82 |
-void pp_free_context(pp_context_t *ppContext); |
|
| 81 |
+pp_context *pp_get_context(int width, int height, int flags); |
|
| 82 |
+void pp_free_context(pp_context *ppContext); |
|
| 83 | 83 |
|
| 84 | 84 |
#define PP_CPU_CAPS_MMX 0x80000000 |
| 85 | 85 |
#define PP_CPU_CAPS_MMX2 0x20000000 |