Commit | Line | Data |
---|---|---|
147479c9 TUBK |
1 | This resolves some "declaration of C function conflicts with previous |
2 | declaration" errors during compilation. | |
3 | ||
4 | --- a/src/FFmpeg.h 2015-02-21 00:33:33.853857529 +0100 | |
5 | +++ b/src/FFmpeg.h 2015-02-21 00:35:09.626497205 +0100 | |
6 | @@ -688,7 +688,7 @@ | |
7 | FFMPEG_FUNCTION_WITH_RETURN( | |
8 | AVOutputFormat*, | |
9 | av_oformat_next, | |
10 | - (AVOutputFormat *f), | |
11 | + (const AVOutputFormat *f), | |
12 | (f) | |
13 | ); | |
14 | FFMPEG_FUNCTION_WITH_RETURN( | |
15 | @@ -755,7 +755,7 @@ | |
16 | FFMPEG_FUNCTION_WITH_RETURN( | |
17 | int, | |
18 | av_fifo_size, | |
19 | - (AVFifoBuffer *f), | |
20 | + (const AVFifoBuffer *f), | |
21 | (f) | |
22 | ); | |
23 | FFMPEG_FUNCTION_WITH_RETURN( | |
24 | @@ -801,7 +801,7 @@ | |
25 | FFMPEG_FUNCTION_WITH_RETURN( | |
26 | AVDictionaryEntry *, | |
27 | av_dict_get, | |
28 | - (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), | |
29 | + (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), | |
30 | (m, key, prev, flags) | |
31 | ); | |
32 | FFMPEG_FUNCTION_WITH_RETURN( |