diff options
Diffstat (limited to 'libavutil/wchar_filename.h')
| -rw-r--r-- | libavutil/wchar_filename.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 2781773dee..2ade321bed 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -1,18 +1,18 @@ /* - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -23,6 +23,7 @@ #include <windows.h> #include "mem.h" +av_warn_unused_result static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w) { int num_chars; @@ -31,7 +32,7 @@ static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w) *filename_w = NULL; return 0; } - *filename_w = av_mallocz(sizeof(wchar_t) * num_chars); + *filename_w = (wchar_t *)av_mallocz_array(num_chars, sizeof(wchar_t)); if (!*filename_w) { errno = ENOMEM; return -1; |