generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deprecate guess_format() in favor of av_guess_format().

Browse Source 
Originally committed as revision 20991 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-01-01 12:46:24 +00:00
parent debe86bfed
commit a1f547b94a
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/avformat.h
View File

@ -22,7 +22,7 @@
#define AVFORMAT_AVFORMAT_H #define AVFORMAT_AVFORMAT_H
#define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 44 #define LIBAVFORMAT_VERSION_MINOR 45
#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
@ -716,6 +716,13 @@ void av_register_output_format(AVOutputFormat *format);
attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name, attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name,
const char *filename, const char *filename,
const char *mime_type); const char *mime_type);
/**
* @deprecated Use av_guess_format() instead.
*/
attribute_deprecated AVOutputFormat *guess_format(const char *short_name,
const char *filename,
const char *mime_type);
#endif #endif
/** /**
@ -730,7 +737,7 @@ attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name,
* @param mime_type if non-NULL checks if mime_type matches with the * @param mime_type if non-NULL checks if mime_type matches with the
* MIME type of the registered formats * MIME type of the registered formats
*/ */
AVOutputFormat *guess_format(const char *short_name, AVOutputFormat *av_guess_format(const char *short_name,
const char *filename, const char *filename,
const char *mime_type); const char *mime_type);

8
libavformat/utils.c
View File

@ -182,8 +182,16 @@ static int match_format(const char *name, const char *names)
return !strcasecmp(name, names); return !strcasecmp(name, names);
} }
#if LIBAVFORMAT_VERSION_MAJOR < 53
AVOutputFormat *guess_format(const char *short_name, const char *filename, AVOutputFormat *guess_format(const char *short_name, const char *filename,
const char *mime_type) const char *mime_type)
{
return av_guess_format(short_name, filename, mime_type);
}
#endif
AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
const char *mime_type)
{ {
AVOutputFormat *fmt, *fmt_found; AVOutputFormat *fmt, *fmt_found;
int score_max, score; int score_max, score;