git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
90944ee
)
avconv: do not set encoder options when streamcopy is used
author
Anton Khirnov
<anton@khirnov.net>
Mon, 23 May 2016 07:29:01 +0000
(09:29 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Tue, 21 Jun 2016 10:39:02 +0000
(12:39 +0200)
avconv.c
patch
|
blob
|
history
diff --git
a/avconv.c
b/avconv.c
index
6470837
..
d7365f3
100644
(file)
--- a/
avconv.c
+++ b/
avconv.c
@@
-1735,10
+1735,6
@@
static int init_output_stream(OutputStream *ost, char *error, int error_len)
ost->st->time_base = ost->enc_ctx->time_base;
} else if (ost->stream_copy) {
- ret = av_opt_set_dict(ost->enc_ctx, &ost->encoder_opts);
- if (ret < 0)
- return ret;
-
/*
* FIXME: will the codec context used by the parser during streamcopy
* This should go away with the new parser API.