Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several build failure fixes #130

Closed
wants to merge 4 commits into from
Closed
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

FFmpeg: add missing "const" to 3 prototypes
  • Loading branch information
MaxKellermann committed Apr 28, 2016
commit 41de5b385b2ca721a71871fcdb00ec3fa4441b5b
@@ -671,12 +671,21 @@ extern "C" {
(AVFormatContext *s, AVDictionary **options),
(s, options)
);
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(55, 33, 101)
FFMPEG_FUNCTION_WITH_RETURN(
AVOutputFormat*,
av_oformat_next,
(const AVOutputFormat *f),
(f)
);
#else
FFMPEG_FUNCTION_WITH_RETURN(
AVOutputFormat*,
av_oformat_next,
(AVOutputFormat *f),
(f)
);
#endif
FFMPEG_FUNCTION_WITH_RETURN(
AVCodec*,
av_codec_next,
@@ -743,12 +752,21 @@ extern "C" {
(AVFifoBuffer *f),
(f)
);
#if LIBAVUTIL_VERSION_MAJOR >= 53
FFMPEG_FUNCTION_WITH_RETURN(
int,
av_fifo_size,
(const AVFifoBuffer *f),
(f)
);
#else
FFMPEG_FUNCTION_WITH_RETURN(
int,
av_fifo_size,
(AVFifoBuffer *f),
(f)
);
#endif
FFMPEG_FUNCTION_WITH_RETURN(
void*,
av_malloc,
@@ -796,12 +814,21 @@ extern "C" {
(AVDictionary **m),
(m)
);
#if LIBAVUTIL_VERSION_MAJOR >= 53
FFMPEG_FUNCTION_WITH_RETURN(
AVDictionaryEntry *,
av_dict_get,
(const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
(m, key, prev, flags)
);
#else
FFMPEG_FUNCTION_WITH_RETURN(
AVDictionaryEntry *,
av_dict_get,
(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
(m, key, prev, flags)
);
#endif
FFMPEG_FUNCTION_WITH_RETURN(
int,
av_dict_set,
ProTip! Use n and p to navigate between commits in a pull request.