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/avformat.h | |
| 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/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 8e8ab91b2d..a71993708f 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -712,9 +712,11 @@ enum CodecID av_guess_image2_codec(const char *filename); /* utils.c */ void av_register_input_format(AVInputFormat *format); void av_register_output_format(AVOutputFormat *format); -AVOutputFormat *guess_stream_format(const char *short_name, +#if LIBAVFORMAT_VERSION_MAJOR < 53 +attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name, const char *filename, const char *mime_type); +#endif AVOutputFormat *guess_format(const char *short_name, const char *filename, const char *mime_type); |