Commit a1967050 authored by Rafaël Carré's avatar Rafaël Carré

vlc-thumb: bugfixes suggested by courmisch

parent b3c26d99
...@@ -56,7 +56,8 @@ static void cmdline(int argc, const char **argv, const char **in, ...@@ -56,7 +56,8 @@ static void cmdline(int argc, const char **argv, const char **in,
*in = argv[idx++]; *in = argv[idx++];
*out = strdup(argv[idx++]); *out = strdup(argv[idx++]);
assert(*out); if (!*out)
abort();
len = strlen(*out); len = strlen(*out);
if (len >= 4 && !strcmp(*out + len - 4, ".png")) { if (len >= 4 && !strcmp(*out + len - 4, ".png")) {
...@@ -69,7 +70,8 @@ static void cmdline(int argc, const char **argv, const char **in, ...@@ -69,7 +70,8 @@ static void cmdline(int argc, const char **argv, const char **in,
* and nautilus doesn't give filenames ending in .png */ * and nautilus doesn't give filenames ending in .png */
*out_with_ext = malloc(len + sizeof ".png"); *out_with_ext = malloc(len + sizeof ".png");
assert(*out_with_ext); if (!*out_with_ext)
abort();
strcpy(*out_with_ext, *out); strcpy(*out_with_ext, *out);
strcat(*out_with_ext, ".png"); strcat(*out_with_ext, ".png");
} }
...@@ -86,7 +88,7 @@ static libvlc_instance_t *create_libvlc(void) ...@@ -86,7 +88,7 @@ static libvlc_instance_t *create_libvlc(void)
"--no-inhibit", /* we don't want interfaces */ "--no-inhibit", /* we don't want interfaces */
"--no-disable-screensaver", /* we don't want interfaces */ "--no-disable-screensaver", /* we don't want interfaces */
"--no-snapshot-preview", /* no blending in dummy vout */ "--no-snapshot-preview", /* no blending in dummy vout */
#if 1 #ifndef NDEBUG
"--verbose=2", /* full log */ "--verbose=2", /* full log */
#endif #endif
}; };
...@@ -167,7 +169,7 @@ int main(int argc, const char **argv) ...@@ -167,7 +169,7 @@ int main(int argc, const char **argv)
libvlc_media_t *m; libvlc_media_t *m;
/* mandatory to support UTF-8 filenames (provided the locale is well set)*/ /* mandatory to support UTF-8 filenames (provided the locale is well set)*/
setlocale(LC_ALL, getenv("LANG")); setlocale(LC_ALL, "");
cmdline(argc, argv, &in, &out, &out_with_ext, &width); cmdline(argc, argv, &in, &out, &out_with_ext, &width);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment