diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 12:37:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 12:43:57 +0200 |
| commit | 8fdec02fd1951dd8eb5cf6accd890d66b766edb3 (patch) | |
| tree | 4cbf0c05984dae4da4fb0bc4fe6047bfd6b81095 /libavutil | |
| parent | d880b2bdfff6004a8a0a7b2d19d4f2822285f0a5 (diff) | |
| parent | 0420c810ceb430003f9f2793c5cfa1fe84657f3d (diff) | |
| download | ffmpeg-8fdec02fd1951dd8eb5cf6accd890d66b766edb3.tar.gz | |
Merge commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d'
* commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d':
log: pass the correct parameters to missing_feature_sample
Conflicts:
libavutil/log.c
See: 572e38a513139b21c35acfef13aa7c4e307ab648
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/log.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index 15ff5f86bc..a4111f6274 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -282,7 +282,8 @@ void av_log_set_callback(void (*callback)(void*, int, const char*, va_list)) av_log_callback = callback; } -static void missing_feature_sample(int sample, void *avc, const char *msg, va_list argument_list) +static void missing_feature_sample(int sample, void *avc, const char *msg, + va_list argument_list) { av_vlog(avc, AV_LOG_WARNING, msg, argument_list); av_log(avc, AV_LOG_WARNING, " is not implemented. Update your FFmpeg " |