Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'
authorTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 04:28:13 +0000 (21:28 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 04:28:43 +0000 (21:28 -0700)
* 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>
ffmpeg.c

index 8677f26c1ed564402463082d5f77e699498172d9..e1d1e635c249d339d9d0482c3ec7041e1026b316 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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,