Revision 57011a13

View differences:

libavformat/avformat.h
22 22
#define AVFORMAT_AVFORMAT_H
23 23

  
24 24
#define LIBAVFORMAT_VERSION_MAJOR 52
25
#define LIBAVFORMAT_VERSION_MINOR 35
25
#define LIBAVFORMAT_VERSION_MINOR 36
26 26
#define LIBAVFORMAT_VERSION_MICRO  0
27 27

  
28 28
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
libavformat/options.c
40 40
#define D AV_OPT_FLAG_DECODING_PARAM
41 41

  
42 42
static const AVOption options[]={
43
{"probesize", NULL, OFFSET(probesize), FF_OPT_TYPE_INT, 32000, 32, INT_MAX, D}, /* 32000 from mpegts.c: 1.0 second at 24Mbit/s */
43
{"probesize", "set probing size", OFFSET(probesize), FF_OPT_TYPE_INT, 5000000, 32, INT_MAX, D},
44 44
{"muxrate", "set mux rate", OFFSET(mux_rate), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E},
45 45
{"packetsize", "set packet size", OFFSET(packet_size), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E},
46 46
{"fflags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, D|E, "fflags"},
libavformat/utils.c
1980 1980
    }
1981 1981
}
1982 1982

  
1983
/* absolute maximum size we read until we abort */
1984
#define MAX_READ_SIZE        5000000
1985

  
1986 1983
#define MAX_STD_TIMEBASES (60*12+5)
1987 1984
static int get_std_framerate(int i){
1988 1985
    if(i<60*12) return i*1001;
......
2081 2078
            }
2082 2079
        }
2083 2080
        /* we did not get all the codec info, but we read too much data */
2084
        if (read_size >= MAX_READ_SIZE) {
2081
        if (read_size >= ic->probesize) {
2085 2082
            ret = count;
2086
            av_log(ic, AV_LOG_DEBUG, "MAX_READ_SIZE reached\n");
2083
            av_log(ic, AV_LOG_DEBUG, "MAX_READ_SIZE:%d reached\n", ic->probesize);
2087 2084
            break;
2088 2085
        }
2089 2086

  

Also available in: Unified diff