diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-01 08:18:50 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-01 08:18:50 +0300 |
| commit | bec3b84f5ef798ab843028dd62018571a50330ed (patch) | |
| tree | a1805e73289111518e6343d255da1085736cb7f1 /TOOLS/vivodump.c | |
| parent | 9d27862072a233b423d4a81e966b1ba9627724a6 (diff) | |
| parent | 19c9e0aceb9620c862cab91b509df91931821d66 (diff) | |
| download | mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.bz2 mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.xz | |
Merge svn changes up to r26624
Conflicts:
Makefile
Diffstat (limited to 'TOOLS/vivodump.c')
| -rw-r--r-- | TOOLS/vivodump.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/TOOLS/vivodump.c b/TOOLS/vivodump.c index bd6d3db3a1..fe1cd90d77 100644 --- a/TOOLS/vivodump.c +++ b/TOOLS/vivodump.c @@ -4,7 +4,6 @@ #include <inttypes.h> #include "loader/wine/mmreg.h" -#include "loader/wine/avifmt.h" #include "loader/wine/vfw.h" #include "stream/stream.h" @@ -34,7 +33,7 @@ int bufptr=0; int bitcnt=0; unsigned char buf=0; -unsigned int x_get_bits(int n){ +static unsigned int x_get_bits(int n){ unsigned int x=0; while(n-->0){ if(!bitcnt){ @@ -59,7 +58,7 @@ int width=320; int height=240; /* most is hardcoded. should extend to handle all h263 streams */ -int h263_decode_picture_header(unsigned char *b_ptr) +static int h263_decode_picture_header(unsigned char *b_ptr) { int i; |