diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-12 14:50:54 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-12 14:57:18 +0300 |
| commit | 8685eea8c2047036f147ca3b6ef1eb0b2354bebb (patch) | |
| tree | 62f498573bb7b51151e505628c7639bcb1e64de7 /libvo/vo_jpeg.c | |
| parent | 9f7c6291a525b62628360166f8313db6904fb44e (diff) | |
| download | mpv-8685eea8c2047036f147ca3b6ef1eb0b2354bebb.tar.bz2 mpv-8685eea8c2047036f147ca3b6ef1eb0b2354bebb.tar.xz | |
Rename exit_player() use outside core to exit_player_bad()
The VOs which use it shouldn't really exit the whole program. The
renaming will allow including mplayer.h in mplayer.c without clashing
with the static exit_player() there.
Diffstat (limited to 'libvo/vo_jpeg.c')
| -rw-r--r-- | libvo/vo_jpeg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c index 72fc6e9d0d..3d8fcc77f0 100644 --- a/libvo/vo_jpeg.c +++ b/libvo/vo_jpeg.c @@ -44,7 +44,7 @@ #include "mp_msg.h" #include "video_out.h" #include "video_out_internal.h" -#include "mplayer.h" /* for exit_player() */ +#include "mplayer.h" /* for exit_player_bad() */ #include "help_mp.h" /* ------------------------------------------------------------------------- */ @@ -121,17 +121,17 @@ static void jpeg_mkdir(char *buf, int verbose) { MSGTR_VO_GenericError, strerror(errno) ); mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name, MSGTR_VO_UnableToAccess,buf); - exit_player(MSGTR_Exit_error); + exit_player_bad(MSGTR_Exit_error); } if ( !S_ISDIR(stat_p.st_mode) ) { mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name, buf, MSGTR_VO_ExistsButNoDirectory); - exit_player(MSGTR_Exit_error); + exit_player_bad(MSGTR_Exit_error); } if ( !(stat_p.st_mode & S_IWUSR) ) { mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n", info.short_name, buf, MSGTR_VO_DirExistsButNotWritable); - exit_player(MSGTR_Exit_error); + exit_player_bad(MSGTR_Exit_error); } mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name, @@ -143,7 +143,7 @@ static void jpeg_mkdir(char *buf, int verbose) { MSGTR_VO_GenericError, strerror(errno) ); mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n", info.short_name, buf, MSGTR_VO_CantCreateDirectory); - exit_player(MSGTR_Exit_error); + exit_player_bad(MSGTR_Exit_error); } /* end switch */ } else if ( verbose ) { mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name, @@ -192,7 +192,7 @@ static uint32_t jpeg_write(uint8_t * name, uint8_t * buffer) mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", info.short_name, MSGTR_VO_GenericError, strerror(errno) ); - exit_player(MSGTR_Exit_error); + exit_player_bad(MSGTR_Exit_error); } cinfo.err = jpeg_std_error(&jerr); |