RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-02 21:12:12 +00:00
Code Issues Projects Releases Wiki Activity

add FF_API_GUESS_FORMAT define to disable the deprecated guess_format()

Browse Source 
and guess_stream_format() public functions

Originally committed as revision 25480 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-10-15 12:45:14 +00:00
parent a15c7fd6cb
commit 198ac67fe8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/avformat.h
View File

@ -54,6 +54,9 @@
#ifndef FF_API_REGISTER_PROTOCOL #ifndef FF_API_REGISTER_PROTOCOL
#define FF_API_REGISTER_PROTOCOL (LIBAVFORMAT_VERSION_MAJOR < 53) #define FF_API_REGISTER_PROTOCOL (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif #endif
#ifndef FF_API_GUESS_FORMAT
#define FF_API_GUESS_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
/** /**
* I return the LIBAVFORMAT_VERSION_INT constant. You got * I return the LIBAVFORMAT_VERSION_INT constant. You got
@ -898,7 +901,7 @@ enum CodecID av_guess_image2_codec(const char *filename);
/* utils.c */ /* utils.c */
void av_register_input_format(AVInputFormat *format); void av_register_input_format(AVInputFormat *format);
void av_register_output_format(AVOutputFormat *format); void av_register_output_format(AVOutputFormat *format);
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if FF_API_GUESS_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);

4
libavformat/utils.c
View File

@ -189,7 +189,7 @@ static int match_format(const char *name, const char *names)
return !strcasecmp(name, names); return !strcasecmp(name, names);
} }
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if FF_API_GUESS_FORMAT
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)
{ {
@ -234,7 +234,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
return fmt_found; return fmt_found;
} }
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if FF_API_GUESS_FORMAT
AVOutputFormat *guess_stream_format(const char *short_name, const char *filename, AVOutputFormat *guess_stream_format(const char *short_name, const char *filename,
const char *mime_type) const char *mime_type)
{ {