virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d'

Browse Source 
* commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d':
  log: pass the correct parameters to missing_feature_sample

Conflicts:
	libavutil/log.c

See: 572e38a513

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-07-05 12:37:13 +02:00
parent d880b2bdff 0420c810ce
commit 8fdec02fd1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/log.c
View File

@@ -282,7 +282,8 @@ void av_log_set_callback(void (*callback)(void*, int, const char*, va_list))
av_log_callback = callback; 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_vlog(avc, AV_LOG_WARNING, msg, argument_list);
av_log(avc, AV_LOG_WARNING, " is not implemented. Update your FFmpeg " av_log(avc, AV_LOG_WARNING, " is not implemented. Update your FFmpeg "