diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-12-31 14:12:58 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-12-31 14:12:58 +0000 |
| commit | 1642ee4337988523207ee8f30be9281e6919d95a (patch) | |
| tree | 467b25d855fa72a9e6e4435a89ad1c2ca62544f6 /libavformat/utils.c | |
| parent | f9310cbb2fcfcd9e41cafb3789c3b7ae3b90dbf4 (diff) | |
Deprecate and mark for deletion the function guess_stream_format(),
and clone its code to ffserver_guess_format() in ffserver.c.
guess_stream_format() is hackish since it relies on some undocumented
properties of the name of the muxers (wich is currently only relevant
for the ASF muxer), and has no use outside ffserver.c.
Originally committed as revision 20987 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index d7241f59a7..5eb360c229 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -219,6 +219,7 @@ AVOutputFormat *guess_format(const char *short_name, const char *filename, return fmt_found; } +#if LIBAVFORMAT_VERSION_MAJOR < 53 AVOutputFormat *guess_stream_format(const char *short_name, const char *filename, const char *mime_type) { @@ -237,6 +238,7 @@ AVOutputFormat *guess_stream_format(const char *short_name, const char *filename return fmt; } +#endif enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, const char *filename, const char *mime_type, enum CodecType type){ |