diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2001-11-11 01:18:40 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2001-11-11 01:18:40 +0000 |
| commit | 815cbfe71eabe508378d705ad42c05ef6265ff82 (patch) | |
| tree | 25abceebce76f59f7c15929dc1fe3f221be421fd | |
| parent | ed3460658f77009cce1494e219e9f8e9657fe3f6 (diff) | |
| download | ffmpeg-815cbfe71eabe508378d705ad42c05ef6265ff82.tar.gz | |
QP_store==null bugfix and no opendivx bugfix
Originally committed as revision 2809 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
| -rw-r--r-- | postproc/postprocess.c | 15 | ||||
| -rw-r--r-- | postproc/postprocess_template.c | 15 |
2 files changed, 30 insertions, 0 deletions
diff --git a/postproc/postprocess.c b/postproc/postprocess.c index 7ea6b35b95..8dfef58cc5 100644 --- a/postproc/postprocess.c +++ b/postproc/postprocess.c @@ -2750,12 +2750,14 @@ struct PPMode getPPModeByNameAndQuality(char *name, int quality) ppMode.error += numOfUnknownOptions; } +#ifdef HAVE_ODIVX_POSTPROCESS if(ppMode.lumMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_H; if(ppMode.lumMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_V; if(ppMode.chromMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_H; if(ppMode.chromMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_V; if(ppMode.lumMode & DERING) ppMode.oldMode |= PP_DERING_Y; if(ppMode.chromMode & DERING) ppMode.oldMode |= PP_DERING_C; +#endif return ppMode; } @@ -2781,6 +2783,12 @@ void postprocess(unsigned char * src[], int src_stride, return; */ + static QP_STORE_T zeroArray[2048/8]; + if(QP_store==NULL) + { + QP_store= zeroArray; + QP_stride= 0; + } #ifdef HAVE_ODIVX_POSTPROCESS // Note: I could make this shit outside of this file, but it would mean one @@ -2823,6 +2831,13 @@ void postprocess2(unsigned char * src[], int src_stride, struct PPMode *mode) { + static QP_STORE_T zeroArray[2048/8]; + if(QP_store==NULL) + { + QP_store= zeroArray; + QP_stride= 0; + } + #ifdef HAVE_ODIVX_POSTPROCESS // Note: I could make this shit outside of this file, but it would mean one // more function call... diff --git a/postproc/postprocess_template.c b/postproc/postprocess_template.c index 7ea6b35b95..8dfef58cc5 100644 --- a/postproc/postprocess_template.c +++ b/postproc/postprocess_template.c @@ -2750,12 +2750,14 @@ struct PPMode getPPModeByNameAndQuality(char *name, int quality) ppMode.error += numOfUnknownOptions; } +#ifdef HAVE_ODIVX_POSTPROCESS if(ppMode.lumMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_H; if(ppMode.lumMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_V; if(ppMode.chromMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_H; if(ppMode.chromMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_V; if(ppMode.lumMode & DERING) ppMode.oldMode |= PP_DERING_Y; if(ppMode.chromMode & DERING) ppMode.oldMode |= PP_DERING_C; +#endif return ppMode; } @@ -2781,6 +2783,12 @@ void postprocess(unsigned char * src[], int src_stride, return; */ + static QP_STORE_T zeroArray[2048/8]; + if(QP_store==NULL) + { + QP_store= zeroArray; + QP_stride= 0; + } #ifdef HAVE_ODIVX_POSTPROCESS // Note: I could make this shit outside of this file, but it would mean one @@ -2823,6 +2831,13 @@ void postprocess2(unsigned char * src[], int src_stride, struct PPMode *mode) { + static QP_STORE_T zeroArray[2048/8]; + if(QP_store==NULL) + { + QP_store= zeroArray; + QP_stride= 0; + } + #ifdef HAVE_ODIVX_POSTPROCESS // Note: I could make this shit outside of this file, but it would mean one // more function call... |