diff options
author | Uros Majstorovic <majstor@majstor.org> | 2017-09-09 15:51:17 +0000 |
---|---|---|
committer | Uros Majstorovic <majstor@majstor.org> | 2017-09-09 15:51:17 +0000 |
commit | f80da46b5117930349a5d033857c94f659f687ce (patch) | |
tree | 66f2befe130b6c52eeeca652d5e6732f03e51483 /code/test/vid/client.c | |
parent | 7d3e6b74812527f69aabf9c1bbb0eb37051f94da (diff) | |
parent | 2f99b87aed4d6a5934c8760f329225563698305a (diff) |
fixed conflict
Diffstat (limited to 'code/test/vid/client.c')
-rw-r--r-- | code/test/vid/client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/code/test/vid/client.c b/code/test/vid/client.c index cc84435..858d2ad 100644 --- a/code/test/vid/client.c +++ b/code/test/vid/client.c @@ -93,6 +93,7 @@ int main(int argc, char *argv[]) { const char *codec_arg = "vp9"; const VpxInterface *decoder = get_vpx_decoder_by_name(codec_arg); + outfile = stdout; if (!decoder) die_codec(NULL, "Unknown input codec."); fprintf(stderr, "Using %s\n", vpx_codec_iface_name(decoder->codec_interface())); |