diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
| commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
| tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /TOOLS/vivodump.c | |
| parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
| parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
| download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz | |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'TOOLS/vivodump.c')
| -rw-r--r-- | TOOLS/vivodump.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/TOOLS/vivodump.c b/TOOLS/vivodump.c index fe1cd90d77..a89cb3da2a 100644 --- a/TOOLS/vivodump.c +++ b/TOOLS/vivodump.c @@ -10,6 +10,7 @@ #include "libmpdemux/muxer.h" #include "libmpdemux/demuxer.h" +/* linking hacks */ char *info_name; char *info_artist; char *info_genre; @@ -18,6 +19,10 @@ char *info_copyright; char *info_sourceform; char *info_comment; +char* out_filename = NULL; +char* force_fourcc=NULL; +char* passtmpfile="divx2pass.log"; + static const short h263_format[8][2] = { { 0, 0 }, { 128, 96 }, |