diff mbox series

[FFmpeg-devel] avformat/os_support: use windows stat structs with 64bit time_t

Message ID pull.35.ffstaging.FFmpeg.1654816924018.ffmpegagent@gmail.com
State Accepted
Commit 3b3c567ad3d45a3f5d90668a1dd32f11b89fc4b5
Headers show
Series [FFmpeg-devel] avformat/os_support: use windows stat structs with 64bit time_t | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Aman Karmani June 9, 2022, 11:22 p.m. UTC 
From: softworkz <softworkz@hotmail.com>

Signed-off-by: softworkz <softworkz@hotmail.com>
---
    avformat/os_support: use windows stat structs with 64bit time_t
    
    Signed-off-by: softworkz softworkz@hotmail.com

Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-35%2Fsoftworkz%2Fsubmit_long_filenames2-v1
Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-35/softworkz/submit_long_filenames2-v1
Pull-Request: https://github.com/ffstaging/FFmpeg/pull/35

 libavformat/os_support.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


base-commit: 5d5a01419928d0c00bae54f730eede150cd5b268

Comments

Christopher Degawa June 11, 2022, 6:49 a.m. UTC | #1 
On Thu, Jun 9, 2022 at 6:22 PM softworkz <ffmpegagent@gmail.com> wrote:

> From: softworkz <softworkz@hotmail.com>
>
> Signed-off-by: softworkz <softworkz@hotmail.com>
> ---
>     avformat/os_support: use windows stat structs with 64bit time_t
>
>     Signed-off-by: softworkz softworkz@hotmail.com
>
>
>
Ping on this patch, this fixes an error with decklink due to clang++
complaining about no conversions between the two struct types
Martin Storsjö June 11, 2022, 8:13 a.m. UTC | #2 
On Sat, 11 Jun 2022, Christopher Degawa wrote:

> On Thu, Jun 9, 2022 at 6:22 PM softworkz <ffmpegagent@gmail.com> wrote:
>
>> From: softworkz <softworkz@hotmail.com>
>>
>> Signed-off-by: softworkz <softworkz@hotmail.com>
>> ---
>>     avformat/os_support: use windows stat structs with 64bit time_t
>>
>>     Signed-off-by: softworkz softworkz@hotmail.com
>>
>>
>>
> Ping on this patch, this fixes an error with decklink due to clang++
> complaining about no conversions between the two struct types

Pushed this now, thanks!

// Martin
diff mbox series

Patch

diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 958976cc6f..b419efa408 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -213,7 +213,7 @@  fallback:
     return _access(filename_utf8, mode);
 }
 
-static inline void copy_stat(struct _stati64 *crtstat, struct win32_stat *buf)
+static inline void copy_stat(struct _stat64 *crtstat, struct win32_stat *buf)
 {
     buf->st_dev   = crtstat->st_dev;
     buf->st_ino   = crtstat->st_ino;
@@ -230,7 +230,7 @@  static inline void copy_stat(struct _stati64 *crtstat, struct win32_stat *buf)
 
 static inline int win32_stat(const char *filename_utf8, struct win32_stat *buf)
 {
-    struct _stati64 crtstat = { 0 };
+    struct _stat64 crtstat = { 0 };
     wchar_t *filename_w;
     int ret;
 
@@ -250,7 +250,7 @@  static inline int win32_stat(const char *filename_utf8, struct win32_stat *buf)
 
 static inline int win32_fstat(int fd, struct win32_stat *buf)
 {
-    struct _stati64 crtstat = { 0 };
+    struct _stat64 crtstat = { 0 };
     int ret;
 
     ret = _fstat64(fd, &crtstat);