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

Export av_probe_input_format2.

Browse Source 
Originally committed as revision 23002 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2010-05-01 13:49:35 +00:00
parent 50f852186f
commit 8e2ee182fa
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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 61 #define LIBAVFORMAT_VERSION_MINOR 62
#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, \
@ -887,6 +887,18 @@ AVInputFormat *av_find_input_format(const char *short_name);
*/ */
AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened); 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. * Allocates all the structures needed to read an input stream.
* This does not open the needed codecs for decoding the stream[s]. * This does not open the needed codecs for decoding the stream[s].

2
libavformat/utils.c
View File

@ -310,7 +310,7 @@ int av_filename_number_test(const char *filename)
return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0); 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; AVInputFormat *fmt1, *fmt;
int score; int score;