summaryrefslogtreecommitdiff
path: root/contrib/ffmpeg/vhook/drawtext.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-03-01 03:05:13 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-03-01 03:05:13 +0100
commit1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch)
tree89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/vhook/drawtext.c
parent09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff)
downloadxine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz
xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/vhook/drawtext.c')
-rw-r--r--contrib/ffmpeg/vhook/drawtext.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/ffmpeg/vhook/drawtext.c b/contrib/ffmpeg/vhook/drawtext.c
index 081847620..d3ca767fe 100644
--- a/contrib/ffmpeg/vhook/drawtext.c
+++ b/contrib/ffmpeg/vhook/drawtext.c
@@ -172,7 +172,7 @@ int Configure(void **ctxp, int argc, char *argv[])
ci->outline = 0;
ci->text_height = 0;
- optind = 0;
+ optind = 1;
while ((c = getopt(argc, argv, "f:t:T:x:y:s:c:C:bo")) > 0) {
switch (c) {
case 'f':
@@ -203,7 +203,7 @@ int Configure(void **ctxp, int argc, char *argv[])
case 'C':
if (ParseColor(optarg, ci->bgcolor) == -1)
{
- av_log(NULL, AV_LOG_ERROR, "Invalid foreground color: '%s'. You must specify the color in the internet way(packaged hex): #RRGGBB, ie: -c #ffffff (for white foreground)\n", optarg);
+ av_log(NULL, AV_LOG_ERROR, "Invalid background color: '%s'. You must specify the color in the internet way(packaged hex): #RRGGBB, ie: -C #ffffff (for white background)\n", optarg);
return -1;
}
break;
@@ -506,7 +506,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
if (
( (c == '_') && (text == ci->text) ) || /* skip '_' (consider as space)
IF text was specified in cmd line
- (which doesn't like neasted quotes) */
+ (which doesn't like nested quotes) */
( c == '\n' ) /* Skip new line char, just go to new line */
)
continue;