diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-11-29 11:47:01 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-11-29 12:11:34 +0100 |
| commit | b133ec62443022de48126cba9352ffefed6b4709 (patch) | |
| tree | bc73a82e74ae0b0db107f098b1320429cd3d657b /ffserver.c | |
| parent | 0083514727101f3a7da492f779b482fac161a10f (diff) | |
| download | ffmpeg-b133ec62443022de48126cba9352ffefed6b4709.tar.gz | |
ffserver: improve feedback in case no feed is defined for a stream
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index 46c08d2e00..469046a3ef 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3690,7 +3690,12 @@ static void build_file_streams(void) av_dict_set(&stream->in_opts, "mpeg2ts_compute_pcr", "1", 0); } - http_log("Opening file '%s'\n", stream->feed_filename); + if (!stream->feed_filename[0]) { + http_log("Unspecified feed file for stream '%s'\n", stream->filename); + goto fail; + } + + http_log("Opening feed file '%s' for stream '%s'\n", stream->feed_filename, stream->filename); if ((ret = avformat_open_input(&infile, stream->feed_filename, stream->ifmt, &stream->in_opts)) < 0) { http_log("Could not open '%s': %d\n", stream->feed_filename, ret); /* remove stream (no need to spend more time on it) */ |