diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 16:08:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 16:08:29 +0200 |
| commit | 4347cf9f0fc753706d2c507cab6ed67fc0d0eeee (patch) | |
| tree | f9305b0598d95dd4b48be1d69a388b508bc0f659 /ffmpeg_opt.c | |
| parent | 17b27a7cbe26c790a5ef2967c04a7f5e2add8b93 (diff) | |
| parent | 420aa06a2487469259a04f9be66fd15535372796 (diff) | |
| download | ffmpeg-4347cf9f0fc753706d2c507cab6ed67fc0d0eeee.tar.gz | |
Merge commit '420aa06a2487469259a04f9be66fd15535372796' into release/2.4
* commit '420aa06a2487469259a04f9be66fd15535372796':
avconv: do not overwrite the stream codec context for streamcopy
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 0c7b35a269..239a030031 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1977,8 +1977,8 @@ loop_end: ost->stream_copy = 0; ost->attachment_filename = o->attachments[i]; ost->finished = 1; - ost->enc_ctx->extradata = attachment; - ost->enc_ctx->extradata_size = len; + ost->st->codec->extradata = attachment; + ost->st->codec->extradata_size = len; p = strrchr(o->attachments[i], '/'); av_dict_set(&ost->st->metadata, "filename", (p && *p) ? p + 1 : o->attachments[i], AV_DICT_DONT_OVERWRITE); |