diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-01-01 12:58:03 +0000 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-01-01 12:58:03 +0000 |
commit | 0f52ef1a001e049cda8623821f9b47bfc8a97bf6 (patch) | |
tree | 3c7bf4c82220aba230eff5ef0aa15230cf2dc1c6 /libavformat/utils.c | |
parent | 94b1f33893491d131319b14a9fe3aeca42339497 (diff) | |
download | ffmpeg-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 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 79c5a1d36b..a4c7219e1e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -201,7 +201,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, if (!short_name && filename && av_filename_number_test(filename) && av_guess_image2_codec(filename) != CODEC_ID_NONE) { - return guess_format("image2", NULL, NULL); + return av_guess_format("image2", NULL, NULL); } #endif /* 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, 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; |