Merge commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Jul 2013 10:37:13 +0000 (12:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Jul 2013 10:43:57 +0000 (12:43 +0200)
* commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d':
  log: pass the correct parameters to missing_feature_sample

Conflicts:
libavutil/log.c

See: 572e38a513139b21c35acfef13aa7c4e307ab648

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/log.c

diff --cc libavutil/log.c
@@@ -282,10 -182,11 +282,11 @@@ void av_log_set_callback(void (*callbac
      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 Libav "
 +    av_log(avc, AV_LOG_WARNING, " is not implemented. Update your FFmpeg "
             "version to the newest one from Git. If the problem still "
             "occurs, it means that your file has a feature which has not "
             "been implemented.\n");