diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-09 04:47:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-09 04:47:19 +0200 |
| commit | f9ecb849ef39bc337d9439b829fe08da5c95cc3d (patch) | |
| tree | 761e860a10084d8de4f07815911f697fe11610b9 /libavcodec/dvbsubdec.c | |
| parent | 7b8ed831eb8432d202dad16dedc1758b018bb1fa (diff) | |
| parent | a71bcd1a7f66e210971c44452dc4cdae7bdbd98a (diff) | |
| download | ffmpeg-f9ecb849ef39bc337d9439b829fe08da5c95cc3d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
crypto: Use av_freep instead of av_free
lavf: don't try to free private options if priv_data is NULL.
swscale: fix types of assembly arguments.
swscale: move two macros that are only used once into caller.
swscale: remove unused function.
options: Add missing braces around struct initializer.
mov: Remove leftover crufty debug statement with references to a local file.
dvbsubdec: Fix compilation of debug code.
Remove all uses of now deprecated metadata functions.
Move metadata API from lavf to lavu.
Conflicts:
doc/APIchanges
libavformat/aiffdec.c
libavformat/asfdec.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/cafdec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/mp3enc.c
libavformat/wtv.c
libavutil/avutil.h
libavutil/internal.h
libswscale/swscale.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvbsubdec.c')
| -rw-r--r-- | libavcodec/dvbsubdec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index d6acd5646e..5b09eb14d6 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -35,6 +35,7 @@ #ifdef DEBUG #undef fprintf +#undef perror #if 0 static void png_save(const char *filename, uint8_t *bitmap, int w, int h, uint32_t *rgba_palette) @@ -49,7 +50,7 @@ static void png_save(const char *filename, uint8_t *bitmap, int w, int h, f = fopen(fname, "w"); if (!f) { perror(fname); - exit(1); + return; } fprintf(f, "P6\n" "%d %d\n" @@ -71,7 +72,7 @@ static void png_save(const char *filename, uint8_t *bitmap, int w, int h, f = fopen(fname2, "w"); if (!f) { perror(fname2); - exit(1); + return; } fprintf(f, "P5\n" "%d %d\n" @@ -105,7 +106,7 @@ static void png_save2(const char *filename, uint32_t *bitmap, int w, int h) f = fopen(fname, "w"); if (!f) { perror(fname); - exit(1); + return; } fprintf(f, "P6\n" "%d %d\n" @@ -127,7 +128,7 @@ static void png_save2(const char *filename, uint32_t *bitmap, int w, int h) f = fopen(fname2, "w"); if (!f) { perror(fname2); - exit(1); + return; } fprintf(f, "P5\n" "%d %d\n" |