# HG changeset patch # User ivo # Date 1094406849 0 # Node ID 7dfd84faaa094c87bfb12d57334133a0d536eb96 # Parent 99b14d9c50d525c9ab82c77f954a3551c2c109e7 Some minor vo_jpeg fixes: Removed unused variable dst. MPlayer now exits if it is unable to create a file for JPEG output and prints an appropriate message, instead of going on if all is right (which is not). Added line to authors file. diff -r 99b14d9c50d5 -r 7dfd84faaa09 AUTHORS --- a/AUTHORS Sun Sep 05 17:46:33 2004 +0000 +++ b/AUTHORS Sun Sep 05 17:54:09 2004 +0000 @@ -661,6 +661,7 @@ van Poorten, Ivo (ivop) * multiple directory support for vo_jpeg + * vo_jpeg suboptions parser Verdejo Pinochet, Reynaldo H. (reynaldo) * improved EDL support diff -r 99b14d9c50d5 -r 7dfd84faaa09 help/help_mp-en.h --- a/help/help_mp-en.h Sun Sep 05 17:46:33 2004 +0000 +++ b/help/help_mp-en.h Sun Sep 05 17:54:09 2004 +0000 @@ -757,6 +757,7 @@ #define MSGTR_VO_JPEG_DirExistsButNotWritable "Output directory already exists, but is not writable." #define MSGTR_VO_JPEG_DirExistsAndIsWritable "Output directory already exists and is writable." #define MSGTR_VO_JPEG_CantCreateDirectory "Unable to create ouput directory." +#define MSGTR_VO_JPEG_CantCreateFile "Unable to create output file." #define MSGTR_VO_JPEG_DirectoryCreateSuccess "Output directory successfully created." #define MSGTR_VO_JPEG_ParsingSuboptions "Parsing suboptions." #define MSGTR_VO_JPEG_SuboptionsParsedOK "Suboptions parsed OK." diff -r 99b14d9c50d5 -r 7dfd84faaa09 libvo/vo_jpeg.c --- a/libvo/vo_jpeg.c Sun Sep 05 17:46:33 2004 +0000 +++ b/libvo/vo_jpeg.c Sun Sep 05 17:54:09 2004 +0000 @@ -10,6 +10,7 @@ * 2003-04-25 Spring cleanup -- Alex * 2004-08-04 Added multiple subdirectory support -- Ivo (ivop@euronet.nl) * 2004-09-01 Cosmetics update -- Ivo + * 2004-09-05 Added suboptions parser -- Ivo * */ @@ -147,7 +148,12 @@ if ( !buffer ) return 1; if ( (outfile = fopen(name, "wb") ) == NULL ) { - return 1; + mp_msg(MSGT_VO, MSGL_ERR, "\n%s: %s\n", info.short_name, + MSGTR_VO_JPEG_CantCreateFile); + mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", + info.short_name, MSGTR_VO_JPEG_GenericError, + strerror(errno) ); + exit_player(MSGTR_Exit_error); } cinfo.err = jpeg_std_error(&jerr); @@ -189,7 +195,6 @@ { static uint32_t framecounter = 0, subdircounter = 0; char buf[BUFLENGTH]; - uint8_t *dst = src[0]; static char subdirname[BUFLENGTH] = ""; struct stat stat_p;