diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 21:34:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 21:34:42 +0100 |
| commit | 220f0927b86f5a0d598949257ed22be946fa7f19 (patch) | |
| tree | e3f74dcb0806d75ae334c0a035c74aa20ad247e4 /libavformat | |
| parent | ececbedaa86cddd883f6cdc12cdd1a75a0023550 (diff) | |
| parent | 8b76362836f3c373c3aadc544522edcbef16dd5f (diff) | |
Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'
* commit '8b76362836f3c373c3aadc544522edcbef16dd5f':
lavf: use a fixed width type
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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 fc1ab6d146..ad3ab519d5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -343,7 +343,7 @@ int av_probe_input_buffer2(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; |