summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2016-12-07 15:31:28 +0000
committerAnton Khirnov <anton@khirnov.net>2017-02-04 15:26:04 +0100
commit8b2402483cd87866604f5702e067905853096306 (patch)
treebd7b5f42f4353cbcdc8b4bcf0531f969bbf49fa1
parent9117f10eebfa762bdcc34a101913bd46b546598a (diff)
wip fixup
-rw-r--r--avconv.c5
-rw-r--r--avconv_qsv.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/avconv.c b/avconv.c
index df2327ab3f..6dc2ba6522 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2138,16 +2138,15 @@ static int transcode_init(void)
input_streams[j + ifile->ist_index]->start = av_gettime_relative();
}
/* For each output stream, compute the right encoding parameters */
+#if CONFIG_CUVID
for (i = 0; i < nb_output_streams; i++) {
ost = output_streams[i];
if (!ost->stream_copy) {
-#if CONFIG_CUVID
if (cuvid_transcode_init(ost))
exit_program(1);
}
-#endif
}
-
+#endif
/* init input streams */
for (i = 0; i < nb_input_streams; i++)
diff --git a/avconv_qsv.c b/avconv_qsv.c
index 723c6e0224..1177bc7c5b 100644
--- a/avconv_qsv.c
+++ b/avconv_qsv.c
@@ -80,7 +80,7 @@ int qsv_init(AVCodecContext *s)
frames_ctx->height = FFALIGN(s->coded_height, 32);
frames_ctx->format = AV_PIX_FMT_QSV;
frames_ctx->sw_format = s->sw_pix_fmt;
- frames_ctx->initial_pool_size = 32;
+ frames_ctx->initial_pool_size = 128;
frames_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
ret = av_hwframe_ctx_init(ist->hw_frames_ctx);