diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-09 22:44:09 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-09 22:44:09 -0500 |
| commit | 91f40de289ddc4f9a92ffd02a2810ddddcb5f984 (patch) | |
| tree | 2a6e67a308a19417fe955c4d341a831ceccee2cc /user/libtheora/fix-timeb.patch | |
| parent | 1260f86b565660da72dc1519a8e559bf6698ec2f (diff) | |
| download | packages-91f40de289ddc4f9a92ffd02a2810ddddcb5f984.tar.gz packages-91f40de289ddc4f9a92ffd02a2810ddddcb5f984.tar.bz2 packages-91f40de289ddc4f9a92ffd02a2810ddddcb5f984.tar.xz packages-91f40de289ddc4f9a92ffd02a2810ddddcb5f984.zip | |
user/libtheora: pull in, fix up
Diffstat (limited to 'user/libtheora/fix-timeb.patch')
| -rw-r--r-- | user/libtheora/fix-timeb.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/user/libtheora/fix-timeb.patch b/user/libtheora/fix-timeb.patch new file mode 100644 index 000000000..5344c0757 --- /dev/null +++ b/user/libtheora/fix-timeb.patch @@ -0,0 +1,75 @@ +--- libtheora-1.1.1.orig/examples/dump_psnr.c ++++ libtheora-1.1.1/examples/dump_psnr.c +@@ -37,7 +37,6 @@ + #endif + #include <stdlib.h> + #include <string.h> +-#include <sys/timeb.h> + #include <sys/types.h> + #include <sys/stat.h> + /*Yes, yes, we're going to hell.*/ +--- libtheora-1.1.1.orig/examples/dump_video.c ++++ libtheora-1.1.1/examples/dump_video.c +@@ -37,7 +37,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <sys/timeb.h> ++#include <sys/time.h> + #include <sys/types.h> + #include <sys/stat.h> + /*Yes, yes, we're going to hell.*/ +@@ -205,9 +205,9 @@ + int long_option_index; + int c; + +- struct timeb start; +- struct timeb after; +- struct timeb last; ++ struct timeval start; ++ struct timeval after; ++ struct timeval last; + int fps_only=0; + int frames = 0; + +@@ -418,8 +418,8 @@ + } + + if(fps_only){ +- ftime(&start); +- ftime(&last); ++ gettimeofday(&start, NULL); ++ gettimeofday(&last, NULL); + } + + while(!got_sigint){ +@@ -433,7 +433,7 @@ + videobuf_ready=1; + frames++; + if(fps_only) +- ftime(&after); ++ gettimeofday(&after, NULL); + } + + }else +@@ -442,16 +442,16 @@ + + if(fps_only && (videobuf_ready || fps_only==2)){ + long ms = +- after.time*1000.+after.millitm- +- (last.time*1000.+last.millitm); ++ after.tv_sec*1000.+after.tv_usec/1000- ++ (last.tv_sec*1000.+last.tv_usec/1000); + + if(ms>500 || fps_only==1 || + (feof(infile) && !videobuf_ready)){ + float file_fps = (float)ti.fps_numerator/ti.fps_denominator; + fps_only=2; + +- ms = after.time*1000.+after.millitm- +- (start.time*1000.+start.millitm); ++ ms = after.tv_sec*1000.+after.tv_usec/1000- ++ (start.tv_sec*1000.+start.tv_usec/1000); + + fprintf(stderr,"\rframe:%d rate:%.2fx ", + frames, |