diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 05:17:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 05:17:57 +0100 |
| commit | 35bf91c5b55b43f699138c74618afc1f7815ee1c (patch) | |
| tree | f18de050f8b6aefa4f91f789696edad430dd9eb0 | |
| parent | c06f8bac204a2c8274533f183ad61d2a985f693d (diff) | |
| parent | 8575f5362f98c937758b20ff8512d6767a56208e (diff) | |
| download | ffmpeg-35bf91c5b55b43f699138c74618afc1f7815ee1c.tar.gz | |
Merge commit '8575f5362f98c937758b20ff8512d6767a56208e' into release/1.1
* commit '8575f5362f98c937758b20ff8512d6767a56208e':
lavf: make av_probe_input_buffer more robust
lavf: use a fixed width type
lavf: simplify handling of offset in av_probe_input_buffer()
Conflicts:
libavformat/utils.c
See: cdce0e8a506cafebe47736d891f5b645b57d14b2 and previous commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 89bc141fe4..9d1dad1807 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -433,7 +433,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt, unsigned int offset, unsigned int max_probe_size) { AVProbeData pd = { filename ? filename : "", NULL, -offset }; - unsigned char *buf = NULL; + uint8_t *buf = NULL; uint8_t *mime_type; int ret = 0, probe_size, buf_offset = 0; int score = 0; |