summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-03 20:45:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-03 21:06:24 +0100
commitb79dfd16cbf08ffb250945ecfcac04a2a4775702 (patch)
tree7efef35c5a35f40d42b2ec00581c79c5b9778f25
parentab5d46df1656a23cb75b005a3d7730e189e38c4d (diff)
ffmpeg: dont try to run the subtitle encoder on non subtitle streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 332a2338cd..de9af44954 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1894,7 +1894,8 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
for (i = 0; i < nb_output_streams; i++) {
OutputStream *ost = output_streams[i];
- if (!check_output_constraints(ist, ost) || !ost->encoding_needed)
+ if (!check_output_constraints(ist, ost) || !ost->encoding_needed
+ || ost->enc->type != AVMEDIA_TYPE_SUBTITLE)
continue;
do_subtitle_out(output_files[ost->file_index]->ctx, ost, ist, &subtitle);