diff options
author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-01 20:21:58 +0000 |
---|---|---|
committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-01 20:21:58 +0000 |
commit | 18abbb69a1198ab205444219aad830d20a8acd9c (patch) | |
tree | a0a29016c7a1d17bc8e7cdac20108975f73b1608 /help/help_mp-en.h | |
parent | 9bc6e8097212e5358a0dce1dda158b0f05e017d9 (diff) | |
download | mpv-18abbb69a1198ab205444219aad830d20a8acd9c.tar.bz2 mpv-18abbb69a1198ab205444219aad830d20a8acd9c.tar.xz |
fixes for encoding of multiple files
- do not uninitialize video encoder between files
- checks for image size & format change moved from mencoder.c to vfilters
by Oded Shimon <ods15@ods15.dyndns.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14879 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'help/help_mp-en.h')
-rw-r--r-- | help/help_mp-en.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/help/help_mp-en.h b/help/help_mp-en.h index cf2d13b403..061d1a4f3c 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -215,7 +215,7 @@ static char help_text[]= #define MSGTR_WritingAVIHeader "Writing AVI header...\n" #define MSGTR_DuplicateFrames "\n%d duplicate frame(s)!\n" #define MSGTR_SkipFrame "\nSkipping frame!\n" -#define MSGTR_ResolutionDoesntMatch "\nNew video file has different resolution than the previous one.\n" +#define MSGTR_ResolutionDoesntMatch "\nNew video file has different resolution or colorspace than the previous one.\n" #define MSGTR_FrameCopyFileMismatch "\nAll video files must have identical fps, resolution, and codec for -ovc copy.\n" #define MSGTR_AudioCopyFileMismatch "\nAll files must have identical audio codec and format for -oac copy.\n" #define MSGTR_ErrorWritingFile "%s: Error writing file.\n" |