[FFmpeg-cvslog] ffmpeg: dont try to run the subtitle encoder on non subtitle streams

Michael Niedermayer git at videolan.org
Mon Mar 3 21:14:27 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  3 20:45:41 2014 +0100| [b79dfd16cbf08ffb250945ecfcac04a2a4775702] | committer: Michael Niedermayer

ffmpeg: dont try to run the subtitle encoder on non subtitle streams

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b79dfd16cbf08ffb250945ecfcac04a2a4775702
---

 ffmpeg.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 332a233..de9af44 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);



More information about the ffmpeg-cvslog mailing list