From 8e2ee182fabbd440de418e94f0722f49c17e4c94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Sat, 1 May 2010 13:49:35 +0000 Subject: [PATCH] Export av_probe_input_format2. Originally committed as revision 23002 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avformat.h | 14 +++++++++++++- libavformat/utils.c | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 184e68b246..a0fa4c2ca0 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 61 +#define LIBAVFORMAT_VERSION_MINOR 62 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -888,6 +888,18 @@ AVInputFormat *av_find_input_format(const char *short_name); AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened); /** + * Guesses the file format. + * + * @param is_opened Whether the file is already opened; determines whether + * demuxers with or without AVFMT_NOFILE are probed. + * @param score_max minimum score required to accept a detection, set to actual + * detection score afterwards. + * If the score is < AVPROBE_SCORE_MAX / 4 it is recommended + * to retry with a larger probe buffer. + */ +AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max); + +/** * Allocates all the structures needed to read an input stream. * This does not open the needed codecs for decoding the stream[s]. */ diff --git a/libavformat/utils.c b/libavformat/utils.c index 625a190a83..9e6279a06b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -310,7 +310,7 @@ int av_filename_number_test(const char *filename) return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0); } -static AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max) +AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max) { AVInputFormat *fmt1, *fmt; int score; -- 2.11.0