Mercurial > libavformat.hg

changeset 5482:68c900a2d203 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author stefano
date Thu, 31 Dec 2009 14:12:58 +0000
parents 999956f447c9
children 8e76d9959123
files avformat.h utils.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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){