diff options
author | James Almer <jamrial@gmail.com> | 2016-08-06 13:31:12 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2016-08-06 13:31:12 -0300 |
commit | 61da882cea4579658e8d01e24b8cb71c98df2b94 (patch) | |
tree | 3678708944f57b1e988f7ca640dbfae77744f42e /ffmpeg.c | |
parent | 2ce985c049bccec6ca625ab9944f54f132499d54 (diff) | |
parent | 90944ee3ab79081845ea1bd97eea475031ce0842 (diff) | |
download | ffmpeg-61da882cea4579658e8d01e24b8cb71c98df2b94.tar.gz |
Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'
* commit '90944ee3ab79081845ea1bd97eea475031ce0842':
avconv: refactor selecting an encoder
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 10 |
1 files changed, 0 insertions, 10 deletions
@@ -3047,16 +3047,6 @@ static int transcode_init(void) abort(); } } else { - if (!ost->enc) - ost->enc = avcodec_find_encoder(enc_ctx->codec_id); - if (!ost->enc) { - /* should only happen when a default codec is not present. */ - snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d:%d", - avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index); - ret = AVERROR(EINVAL); - goto dump_format; - } - set_encoder_id(output_files[ost->file_index], ost); #if CONFIG_LIBMFX |