History

Export av_probe_input_format2.

Originally committed as revision 23002 to svn://svn.ffmpeg.org/ffmpeg/trunk

Reimar Döffinger committed 16 years ago

Commit 8e2ee181 parent 50f85212 files · +14 −2Browse files

Unified · Split

2 files
  1. libavformat/avformat.h +13 −1
  2. libavformat/utils.c +1 −1
libavformat/avformat.h+13−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #define AVFORMAT_AVFORMAT_H
2323
2424 #define LIBAVFORMAT_VERSION_MAJOR 52
25−#define LIBAVFORMAT_VERSION_MINOR 61
25+#define LIBAVFORMAT_VERSION_MINOR 62
2626 #define LIBAVFORMAT_VERSION_MICRO 0
2727
2828 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
@@ -887,6 +887,18 @@ AVInputFormat *av_find_input_format(const char *short_name); · 858 unmodified lines
887887 */
888888 AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
889889
890+/**
891+ * Guesses the file format.
892+ *
893+ * @param is_opened Whether the file is already opened; determines whether
894+ * demuxers with or without AVFMT_NOFILE are probed.
895+ * @param score_max minimum score required to accept a detection, set to actual
896+ * detection score afterwards.
897+ * If the score is < AVPROBE_SCORE_MAX / 4 it is recommended
898+ * to retry with a larger probe buffer.
899+ */
900+AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
901+
890902 /**
891903 * Allocates all the structures needed to read an input stream.
892904 * This does not open the needed codecs for decoding the stream[s].
libavformat/utils.c+1−1
@@ -310,7 +310,7 @@ int av_filename_number_test(const char *filename) · 309 unmodified lines
310310 return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0);
311311 }
312312
313−static AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max)
313+AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max)
314314 {
315315 AVInputFormat *fmt1, *fmt;
316316 int score;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t