aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-01-01 12:58:03 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-01-01 12:58:03 +0000
commit0f52ef1a001e049cda8623821f9b47bfc8a97bf6 (patch)
tree3c7bf4c82220aba230eff5ef0aa15230cf2dc1c6 /ffserver.c
parent94b1f33893491d131319b14a9fe3aeca42339497 (diff)
downloadffmpeg-0f52ef1a001e049cda8623821f9b47bfc8a97bf6.tar.gz
Use av_guess_format() in place of the deprecated guess_format().
Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ffserver.c b/ffserver.c
index 23665a1e22..e545c060ed 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3170,7 +3170,7 @@ static int rtp_new_av_stream(HTTPContext *c,
ctx = avformat_alloc_context();
if (!ctx)
return -1;
- ctx->oformat = guess_format("rtp", NULL, NULL);
+ ctx->oformat = av_guess_format("rtp", NULL, NULL);
st = av_mallocz(sizeof(AVStream));
if (!st)
@@ -3734,14 +3734,14 @@ static int ffserver_opt_default(const char *opt, const char *arg,
static AVOutputFormat *ffserver_guess_format(const char *short_name, const char *filename,
const char *mime_type)
{
- AVOutputFormat *fmt = guess_format(short_name, filename, mime_type);
+ AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type);
if (fmt) {
AVOutputFormat *stream_fmt;
char stream_format_name[64];
snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", fmt->name);
- stream_fmt = guess_format(stream_format_name, NULL, NULL);
+ stream_fmt = av_guess_format(stream_format_name, NULL, NULL);
if (stream_fmt)
fmt = stream_fmt;
@@ -3880,7 +3880,7 @@ static int parse_ffconfig(const char *filename)
}
}
- feed->fmt = guess_format("ffm", NULL, NULL);
+ feed->fmt = av_guess_format("ffm", NULL, NULL);
/* defaut feed file */
snprintf(feed->feed_filename, sizeof(feed->feed_filename),
"/tmp/%s.ffm", feed->filename);