summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-03 12:38:05 +0100
committerAnton Khirnov <anton@khirnov.net>2011-04-19 18:28:38 +0200
commit61573bf1ba50dc8828d0e87d913389fbcff48509 (patch)
tree704788b84db8de55c9c0efd8acbc688fc9b7020b /libavformat/utils.c
parentdcd4a7b62f16793c33fa459889e581286d6ccdd6 (diff)
lavf: remove FF_API_GUESS_FORMAT cruft
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index cf8f9fae63..80700d4b2b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -200,14 +200,6 @@ static int match_format(const char *name, const char *names)
return !strcasecmp(name, names);
}
-#if FF_API_GUESS_FORMAT
-AVOutputFormat *guess_format(const char *short_name, const char *filename,
- 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)
{
@@ -243,27 +235,6 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
return fmt_found;
}
-#if FF_API_GUESS_FORMAT
-AVOutputFormat *guess_stream_format(const char *short_name, const char *filename,
- const char *mime_type)
-{
- AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type);
-
- if (fmt) {
- AVOutputFormat *stream_fmt;
- char stream_format_name[64];
-
- snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", fmt->name);
- stream_fmt = av_guess_format(stream_format_name, NULL, NULL);
-
- if (stream_fmt)
- fmt = stream_fmt;
- }
-
- return fmt;
-}
-#endif
-
enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
const char *filename, const char *mime_type, enum AVMediaType type){
if(type == AVMEDIA_TYPE_VIDEO){