eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 19:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'

Browse Source 
* commit '90944ee3ab79081845ea1bd97eea475031ce0842':
  avconv: refactor selecting an encoder

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2016-08-06 13:31:12 -03:00
parent 2ce985c049 90944ee3ab
commit 61da882cea
2 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ffmpeg.c
View File

@@ -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