CVS change done by The Wanderer CVS Update of /cvsroot/mplayer/main/help In directory mail:/var2/tmp/cvs-serv2139/help Modified Files: help_mp-en.h Log Message: make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet Index: help_mp-en.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-en.h,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- help_mp-en.h 15 Dec 2005 17:54:29 -0000 1.214 +++ help_mp-en.h 15 Dec 2005 17:57:18 -0000 1.215 @@ -238,6 +238,9 @@ #define MSGTR_NoVideoEncoderSelected "\nNo video encoder (-ovc) selected. Select one (see -ovc help).\n" #define MSGTR_CannotOpenOutputFile "Cannot open output file '%s'.\n" #define MSGTR_EncoderOpenFailed "Failed to open the encoder.\n" +#define MSGTR_MencoderWrongFormatAVI "\nWARNING: OUTPUT FILE FORMAT IS _AVI_. see -of help.\n" +#define MSGTR_MencoderWrongFormatMPG "\nWARNING: OUTPUT FILE FORMAT IS _MPEG_. see -of help.\n" +#define MSGTR_MissingOutputFilename "No output file specified, please see the -o option" #define MSGTR_ForcingOutputFourcc "Forcing output fourcc to %x [%.4s]\n" #define MSGTR_ForcingOutputAudiofmtTag "Forcing output audio format tag to 0x%x\n" #define MSGTR_DuplicateFrames "\n%d duplicate frame(s)!\n"
On Thu, Dec 15, 2005 at 06:57:21PM +0100, The Wanderer CVS wrote:
CVS change done by The Wanderer CVS
Update of /cvsroot/mplayer/main/help In directory mail:/var2/tmp/cvs-serv2139/help
Nice! thanks for taking the time.
Modified Files: help_mp-en.h Log Message: make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
Well, just a few things: if you want to shorten my name, use Reynaldo Verdejo ;) that patch was originally written by Oded, i just modified it Best regards and thanks again. Reynaldo
Reynaldo H. Verdejo Pinochet wrote:
On Thu, Dec 15, 2005 at 06:57:21PM +0100, The Wanderer CVS wrote:
CVS change done by The Wanderer CVS
Update of /cvsroot/mplayer/main/help In directory mail:/var2/tmp/cvs-serv2139/help
Nice! thanks for taking the time.
Not a problem; I should have gotten to it earlier, actually.
Modified Files: help_mp-en.h Log Message: make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
Well, just a few things:
if you want to shorten my name, use Reynaldo Verdejo ;)
Acknowledged - I wasn't sure, but I'll try to remember this in future. (Avoiding the shorter forms would come more easily if I could be sure enough of my editor to write the commit message somewhere other than the command line, and so be able to split it into multiple lines..) Is it important enough for me to change the commit message in the log?
that patch was originally written by Oded, i just modified it
I knew that he made the original proposal of that change, but my understanding was that your patch was not just a retooling of his previous one... and in any case, I don't seem to recall many (any?) times when multiple people who contributed revisions along the way to a final patch were credited in the commit message. -- The Wanderer Warning: Simply because I argue an issue does not mean I agree with any side of it. Secrecy is the beginning of tyranny.
On Thu, Dec 15, 2005 at 03:50:17PM -0500, The Wanderer wrote:
Reynaldo H. Verdejo Pinochet wrote:
Well, just a few things:
if you want to shorten my name, use Reynaldo Verdejo ;)
Acknowledged - I wasn't sure, but I'll try to remember this in future.
Thanks ;)
(Avoiding the shorter forms would come more easily if I could be sure enough of my editor to write the commit message somewhere other than the command line, and so be able to split it into multiple lines..)
:P
Is it important enough for me to change the commit message in the log?
Not at all
that patch was originally written by Oded, i just modified it
I knew that he made the original proposal of that change, but my understanding was that your patch was not just a retooling of his previous one... and in any case, I don't seem to recall many (any?) times when multiple people who contributed revisions along the way to a final patch were credited in the commit message.
yep, youre right, noprob then. Best regards Reynaldo
On Thu, Dec 15, 2005 at 03:50:17PM -0500, The Wanderer wrote:
Reynaldo H. Verdejo Pinochet wrote:
Modified Files: help_mp-en.h Log Message: make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
Well, just a few things:
if you want to shorten my name, use Reynaldo Verdejo ;)
Acknowledged - I wasn't sure, but I'll try to remember this in future.
Some background info: In Spanish-speaking country people get the names of both parents, so Reynaldo's dad is called Verdejo and his mom Pinochet, my dad is Biurrun, my mom Sotelo, thus making my full name Enrique Diego Biurrun Sotelo.
(Avoiding the shorter forms would come more easily if I could be sure enough of my editor to write the commit message somewhere other than the command line, and so be able to split it into multiple lines..)
If you just use 'cvs commit', you'll be dropped into an editor, vi as default or whatever you have in the VISUAL or EDITOR environment variables... Diego
Diego Biurrun wrote:
On Thu, Dec 15, 2005 at 03:50:17PM -0500, The Wanderer wrote:
Reynaldo H. Verdejo Pinochet wrote:
Well, just a few things:
if you want to shorten my name, use Reynaldo Verdejo ;)
Acknowledged - I wasn't sure, but I'll try to remember this in future.
Some background info: In Spanish-speaking country people get the names of both parents, so Reynaldo's dad is called Verdejo and his mom Pinochet, my dad is Biurrun, my mom Sotelo, thus making my full name Enrique Diego Biurrun Sotelo.
Okay, I did not know that. Thanks for expanding my world a little.
(Avoiding the shorter forms would come more easily if I could be sure enough of my editor to write the commit message somewhere other than the command line, and so be able to split it into multiple lines..)
If you just use 'cvs commit', you'll be dropped into an editor, vi as default or whatever you have in the VISUAL or EDITOR environment variables...
Yes - the problem is that I do not want to find myself in vi (never have understood how people can manage to use it), and even though I seem to recall having added a line to set the appropriate environment variable to my .bashrc the variable is not set and the line does not seem to be there. (As a side note, since the man page doesn't seem to address the question and it's not the kind of thing I want to just experiment with: is there any way, once the editor has been invoked, to cancel the commit without just killing the process?) -- The Wanderer Warning: Simply because I argue an issue does not mean I agree with any side of it. Secrecy is the beginning of tyranny.
On Thu, Dec 15, 2005 at 06:51:07PM -0500, The Wanderer wrote:
Diego Biurrun wrote:
If you just use 'cvs commit', you'll be dropped into an editor, vi as default or whatever you have in the VISUAL or EDITOR environment variables...
Yes - the problem is that I do not want to find myself in vi (never have understood how people can manage to use it),
Well, once your fingers get used to it, it's great...
and even though I seem to recall having added a line to set the appropriate environment variable to my .bashrc the variable is not set and the line does not seem to be there.
Just putting EDITOR=whatever VISUAL=whatever or export EDITOR=whatever export VISUAL=whatever into your .bashrc should be enough.
(As a side note, since the man page doesn't seem to address the question and it's not the kind of thing I want to just experiment with: is there any way, once the editor has been invoked, to cancel the commit without just killing the process?)
Exit the editor without saving. Diego
Diego Biurrun wrote:
On Thu, Dec 15, 2005 at 06:51:07PM -0500, The Wanderer wrote:
Diego Biurrun wrote:
If you just use 'cvs commit', you'll be dropped into an editor, vi as default or whatever you have in the VISUAL or EDITOR environment variables...
Yes - the problem is that I do not want to find myself in vi (never have understood how people can manage to use it),
Well, once your fingers get used to it, it's great...
It's not my fingers that are the problem, it's my mind; I do not operate in that type of interface paradigm, and I don't really want to. Saying more than that would involve a potentially extensive offtopic rant based on less information than such a thing should be, so I'll leave it there.
and even though I seem to recall having added a line to set the appropriate environment variable to my .bashrc the variable is not set and the line does not seem to be there.
Just putting
EDITOR=whatever VISUAL=whatever
or
export EDITOR=whatever export VISUAL=whatever
into your .bashrc should be enough.
Yes, and I thought I did that, but see above. I'll try it again, though.
(As a side note, since the man page doesn't seem to address the question and it's not the kind of thing I want to just experiment with: is there any way, once the editor has been invoked, to cancel the commit without just killing the process?)
Exit the editor without saving.
Okay. The man page does not appear to indicate that saving the 'file' is required in order to send it; I was not sure that exiting the editor would not automatically send the contents of its buffer as the commit message, even if the buffer were empty. Again, thanks. -- The Wanderer Warning: Simply because I argue an issue does not mean I agree with any side of it. Secrecy is the beginning of tyranny.
On Thu, Dec 15, 2005 at 07:48:48PM -0500, The Wanderer wrote:
Diego Biurrun wrote:
On Thu, Dec 15, 2005 at 06:51:07PM -0500, The Wanderer wrote:
Yes - the problem is that I do not want to find myself in vi (never have understood how people can manage to use it),
Well, once your fingers get used to it, it's great...
It's not my fingers that are the problem, it's my mind; I do not operate in that type of interface paradigm, and I don't really want to. Saying more than that would involve a potentially extensive offtopic rant based on less information than such a thing should be, so I'll leave it there.
Yes, let's not get into editor flamewars :) For the record, I use both vi(m) and (GNU) emacs and like them both equally. Diego
participants (4)
-
Diego Biurrun -
Reynaldo H. Verdejo Pinochet -
syncmail@mplayerhq.hu -
The Wanderer