diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 21:28:13 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 21:28:43 -0700 |
| commit | e5c79cd854922693c80155a1744c9e93f54bce02 (patch) | |
| tree | 6010737c7f99db866703a24a27914b03fd12df4f /ffmpeg.c | |
| parent | 1b04ea1a6c237a94f81d1b8f8a42fae46fbeacab (diff) | |
| parent | 5e1840622ce6e41c57d9c407604863d3f3dcc3ae (diff) | |
| download | ffmpeg-e5c79cd854922693c80155a1744c9e93f54bce02.tar.gz | |
Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'
* commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae':
avconv: fix handling attachments in init_output_stream
Conflicts:
avconv.c
This is functionally a no-op, as we don't have the bug this is trying to
fix. See 843be56ee18928ecf80bcb20d235c4f9cab5a8fd.
Merged-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2677,7 +2677,7 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len) // copy timebase while removing common factors ost->st->time_base = av_add_q(ost->enc_ctx->time_base, (AVRational){0, 1}); ost->st->codec->codec= ost->enc_ctx->codec; - } else { + } else if (ost->stream_copy) { ret = av_opt_set_dict(ost->st->codec, &ost->encoder_opts); if (ret < 0) { av_log(NULL, AV_LOG_FATAL, |