generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use av_guess_format() in place of the deprecated guess_format().

Browse Source 
Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-01-01 12:58:03 +00:00
parent 94b1f33893
commit 0f52ef1a00
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@ -3361,14 +3361,14 @@ static void opt_output_file(const char *filename)
} }
if (last_asked_format) { if (last_asked_format) {
file_oformat = guess_format(last_asked_format, NULL, NULL); file_oformat = av_guess_format(last_asked_format, NULL, NULL);
if (!file_oformat) { if (!file_oformat) {
fprintf(stderr, "Requested output format '%s' is not a suitable output format\n", last_asked_format); fprintf(stderr, "Requested output format '%s' is not a suitable output format\n", last_asked_format);
av_exit(1); av_exit(1);
} }
last_asked_format = NULL; last_asked_format = NULL;
} else { } else {
file_oformat = guess_format(NULL, filename, NULL); file_oformat = av_guess_format(NULL, filename, NULL);
if (!file_oformat) { if (!file_oformat) {
fprintf(stderr, "Unable to find a suitable output format for '%s'\n", fprintf(stderr, "Unable to find a suitable output format for '%s'\n",
filename); filename);

8
ffserver.c
View File

@ -3170,7 +3170,7 @@ static int rtp_new_av_stream(HTTPContext *c,
ctx = avformat_alloc_context(); ctx = avformat_alloc_context();
if (!ctx) if (!ctx)
return -1; return -1;
ctx->oformat = guess_format("rtp", NULL, NULL); ctx->oformat = av_guess_format("rtp", NULL, NULL);
st = av_mallocz(sizeof(AVStream)); st = av_mallocz(sizeof(AVStream));
if (!st) 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, static AVOutputFormat *ffserver_guess_format(const char *short_name, const char *filename,
const char *mime_type) 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) { if (fmt) {
AVOutputFormat *stream_fmt; AVOutputFormat *stream_fmt;
char stream_format_name[64]; char stream_format_name[64];
snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", fmt->name); 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) if (stream_fmt)
fmt = 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 */ /* defaut feed file */
snprintf(feed->feed_filename, sizeof(feed->feed_filename), snprintf(feed->feed_filename, sizeof(feed->feed_filename),
"/tmp/%s.ffm", feed->filename); "/tmp/%s.ffm", feed->filename);

6
libavformat/utils.c
View File

@ -201,7 +201,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
if (!short_name && filename && if (!short_name && filename &&
av_filename_number_test(filename) && av_filename_number_test(filename) &&
av_guess_image2_codec(filename) != CODEC_ID_NONE) { av_guess_image2_codec(filename) != CODEC_ID_NONE) {
return guess_format("image2", NULL, NULL); return av_guess_format("image2", NULL, NULL);
} }
#endif #endif
/* Find the proper file type. */ /* Find the proper file type. */
@ -231,14 +231,14 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
AVOutputFormat *guess_stream_format(const char *short_name, const char *filename, AVOutputFormat *guess_stream_format(const char *short_name, const char *filename,
const char *mime_type) 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) { if (fmt) {
AVOutputFormat *stream_fmt; AVOutputFormat *stream_fmt;
char stream_format_name[64]; char stream_format_name[64];
snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", fmt->name); 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) if (stream_fmt)
fmt = stream_fmt; fmt = stream_fmt;