diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 00:38:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 00:38:02 +0200 |
| commit | 959894632ae67e356ede734e352eabda6bb55794 (patch) | |
| tree | 52eaa0f88d733d8fc25ce152fb39f9e907c92f07 /ffmpeg_opt.c | |
| parent | 4d02dfbde475d249916eb19c360e890059aa6aa5 (diff) | |
| parent | 3892bdab9b652eb003ab95e167f1765e0b0ea035 (diff) | |
| download | ffmpeg-959894632ae67e356ede734e352eabda6bb55794.tar.gz | |
Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'
* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
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 15eee0bd32..8f1f35dde2 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2038,8 +2038,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); |