[FFmpeg-cvslog] ffmpeg: Fix segfault when using ffmpeg with ffserver where ffmpeg does not supply all requested streams .

Michael Niedermayer git at videolan.org
Mon Nov 21 23:45:39 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 21 23:32:39 2011 +0100| [70974bdb278373e346bcc3fd59c9e413f8055fa5] | committer: Michael Niedermayer

ffmpeg: Fix segfault when using ffmpeg with ffserver where ffmpeg does not supply all requested streams.
Fixes Ticket675

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

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

 ffmpeg.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 623716a..8935b17 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3935,6 +3935,10 @@ static void opt_output_file(void *optctx, const char *filename)
                     break;
                 }
             }
+            if(!ost->sync_ist){
+                av_log(NULL, AV_LOG_FATAL, "Missing %s stream which is required by this ffm\n", av_get_media_type_string(ost->st->codec->codec_type));
+                exit_program(1);
+            }
         }
     } else if (!o->nb_stream_maps) {
         /* pick the "best" stream of each type */



More information about the ffmpeg-cvslog mailing list