diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-02 23:48:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-02 23:50:00 +0100 |
| commit | 1bc2fa447c22df09d312a7fba7e95531cfb051f8 (patch) | |
| tree | 436950544900d5124d21e01cb67f513568694b0e /libavformat | |
| parent | 9f6f4962fbfdbaaa5ae82d1cf216356ce4a64e1c (diff) | |
avformat: use AVPROBE_SCORE_STREAM_RETRY, instead of AVPROBE_SCORE_RETRY - 1
This makes the code clearer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 50b710816b..13f6524d85 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -338,6 +338,8 @@ typedef struct AVProbeData { } AVProbeData; #define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4) +#define AVPROBE_SCORE_STREAM_RETRY (AVPROBE_SCORE_MAX/4-1) + #define AVPROBE_SCORE_EXTENSION 50 ///< score for file extension #define AVPROBE_SCORE_MAX 100 ///< maximum score diff --git a/libavformat/utils.c b/libavformat/utils.c index c094eec674..c2705ac4ff 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -659,7 +659,7 @@ no_packet: if (end || av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)) { int score = set_codec_from_probe_data(s, st, pd); - if ( (st->codec->codec_id != AV_CODEC_ID_NONE && score > AVPROBE_SCORE_RETRY-1) + if ( (st->codec->codec_id != AV_CODEC_ID_NONE && score > AVPROBE_SCORE_STREAM_RETRY) || end) { pd->buf_size = 0; av_freep(&pd->buf); diff --git a/libavformat/version.h b/libavformat/version.h index 38945a57fd..7a9aa4d4c7 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 29 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |