# HG changeset patch
# User stefano
# Date 1262268778 0
# Node ID 68c900a2d2035d39f3330b423675f00dc29da059
# Parent  999956f447c9a0d5bae38af83cbf875efd678669
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.

diff -r 999956f447c9 -r 68c900a2d203 avformat.h
--- a/avformat.h	Wed Dec 30 17:12:29 2009 +0000
+++ b/avformat.h	Thu Dec 31 14:12:58 2009 +0000
@@ -712,9 +712,11 @@
 /* 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);
diff -r 999956f447c9 -r 68c900a2d203 utils.c
--- a/utils.c	Wed Dec 30 17:12:29 2009 +0000
+++ b/utils.c	Thu Dec 31 14:12:58 2009 +0000
@@ -219,6 +219,7 @@
     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 @@
 
     return fmt;
 }
+#endif
 
 enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
                             const char *filename, const char *mime_type, enum CodecType type){