Deprecate match_ext() in favor of av_match_ext(), and mark it for deletion at the next major bump.

Originally committed as revision 20998 to svn://svn.ffmpeg.org/ffmpeg/trunk

Stefano Sabatini committed 16 years ago

Commit 8eb631f1 parent 24b207b2 files · +16 −2Browse files

Unified · Split

2 files

 #define AVFORMAT_AVFORMAT_H
 #define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 45
+#define LIBAVFORMAT_VERSION_MINOR 46
 #define LIBAVFORMAT_VERSION_MICRO  0
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                char *path, int path_size,
                const char *url);
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+/**
+ * @deprecated Use av_match_ext() instead.
+ */
+attribute_deprecated int match_ext(const char *filename, const char *extensions);
+#endif
 /**
  * Returns a positive value if the given filename has one of the given
  * extensions, 0 otherwise.
  *
  * @param extensions a comma-separated list of filename extensions
  */
-int match_ext(const char *filename, const char *extensions);
+int av_match_ext(const char *filename, const char *extensions);
 #endif /* HAVE_AV_CONFIG_H */

     format->next = NULL;
 }
+#if LIBAVFORMAT_VERSION_MAJOR < 53
 int match_ext(const char *filename, const char *extensions)
+{
+    return av_match_ext(filename, extensions);
+}
+#endif
+int av_match_ext(const char *filename, const char *extensions)
 {
     const char *ext, *p;
     char ext1[32], *q;

Keyboard shortcuts