diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-23 02:11:16 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-23 02:11:16 +0000 |
| commit | 712a40b59a0f451a558d88db1f9f124463016f97 (patch) | |
| tree | 82bc80e9b7a5ba09c01acf205c8ac1e20c44914f /src/libffmpeg/libavcodec/imgresample.c | |
| parent | 640063a719556f8569fe848528b39660c6fc31a6 (diff) | |
| download | xine-lib-712a40b59a0f451a558d88db1f9f124463016f97.tar.gz xine-lib-712a40b59a0f451a558d88db1f9f124463016f97.tar.bz2 | |
big ffmpeg update
it is likely to break, so please keep both pieces
CVS patchset: 7767
CVS date: 2005/10/23 02:11:16
Diffstat (limited to 'src/libffmpeg/libavcodec/imgresample.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/imgresample.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/imgresample.c b/src/libffmpeg/libavcodec/imgresample.c index 2c7e1120a..d423f388c 100644 --- a/src/libffmpeg/libavcodec/imgresample.c +++ b/src/libffmpeg/libavcodec/imgresample.c @@ -558,6 +558,9 @@ ImgReSampleContext *img_resample_full_init(int owidth, int oheight, { ImgReSampleContext *s; + if (!owidth || !oheight || !iwidth || !iheight) + return NULL; + s = av_mallocz(sizeof(ImgReSampleContext)); if (!s) return NULL; @@ -643,11 +646,13 @@ uint8_t img2[XSIZE1 * YSIZE1]; void save_pgm(const char *filename, uint8_t *img, int xsize, int ysize) { +#undef fprintf FILE *f; f=fopen(filename,"w"); fprintf(f,"P5\n%d %d\n%d\n", xsize, ysize, 255); fwrite(img,1, xsize * ysize,f); fclose(f); +#define fprintf please_use_av_log } static void dump_filter(int16_t *filter) |