Originally committed as revision 23002 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -22,7 +22,7 @@ · 21 unmodified lines | |||
| 22 | #define AVFORMAT_AVFORMAT_H | 22 | #define AVFORMAT_AVFORMAT_H |
| 23 | 23 | ||
| 24 | #define LIBAVFORMAT_VERSION_MAJOR 52 | 24 | #define LIBAVFORMAT_VERSION_MAJOR 52 |
| 25 | #define LIBAVFORMAT_VERSION_MINOR 61 | 25 | #define LIBAVFORMAT_VERSION_MINOR 62 |
| 26 | #define LIBAVFORMAT_VERSION_MICRO 0 | 26 | #define LIBAVFORMAT_VERSION_MICRO 0 |
| 27 | 27 | ||
| 28 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | 28 | #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 | |||
| 887 | */ | 887 | */ |
| 888 | AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened); | 888 | AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened); |
| 889 | 889 | ||
| 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 | |||
| 890 | /** | 902 | /** |
| 891 | * Allocates all the structures needed to read an input stream. | 903 | * Allocates all the structures needed to read an input stream. |
| 892 | * This does not open the needed codecs for decoding the stream[s]. | 904 | * This does not open the needed codecs for decoding the stream[s]. |
| @@ -310,7 +310,7 @@ int av_filename_number_test(const char *filename) · 309 unmodified lines | |||
| 310 | return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0); | 310 | return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0); |
| 311 | } | 311 | } |
| 312 | 312 | ||
| 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) |
| 314 | { | 314 | { |
| 315 | AVInputFormat *fmt1, *fmt; | 315 | AVInputFormat *fmt1, *fmt; |
| 316 | int score; | 316 | int score; |