diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 21:35:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 21:35:40 +0200 |
| commit | 911ba8fb197dee6fb1dd4ac2d1fa2d8541ab6ab5 (patch) | |
| tree | b705257eab737a868ee064e95bd97d51e13785d3 /libavformat/avformat.h | |
| parent | be695ee389724d713e1b8a61ef899fe1795193ce (diff) | |
| parent | b15b06ebf582ae81e47d236524c9ad6e10c8a0a7 (diff) | |
Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'
* commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7':
avformat: use const char* instead of uint8_t* for AVProbeData.mime_type
Conflicts:
libavformat/format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f189741af6..9c545c08d0 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -398,7 +398,7 @@ typedef struct AVProbeData { const char *filename; unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */ int buf_size; /**< Size of buf except extra allocated bytes */ - uint8_t *mime_type; /**< mime_type, when known. */ + const char *mime_type; /**< mime_type, when known. */ } AVProbeData; #define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4) |