Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Apr 2011 23:09:43 +0000 (01:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Apr 2011 23:09:43 +0000 (01:09 +0200)
* qatar/master:
  Use av_log_ask_for_sample() to request samples from users.
  Make av_log_ask_for_sample() accept a variable number of arguments.
  vqavideo: We no longer need to ask for version 1 samples.
  aacdec: indentation cosmetics

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aacdec.c
libavcodec/atrac3.c
libavcodec/avcodec.h
libavcodec/cook.c
libavcodec/loco.c
libavcodec/utils.c
libavcodec/vqavideo.c
libavcodec/wnv1.c
libavformat/oma.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1208,13 -1133,19 +1208,19 @@@ void av_log_missing_feature(void *avc, 
          av_log(avc, AV_LOG_WARNING, "\n");
  }
  
- void av_log_ask_for_sample(void *avc, const char *msg)
+ void av_log_ask_for_sample(void *avc, const char *msg, ...)
  {
+     va_list argument_list;
+     va_start(argument_list, msg);
      if (msg)
-         av_log(avc, AV_LOG_WARNING, "%s ", msg);
+         av_vlog(avc, AV_LOG_WARNING, msg, argument_list);
      av_log(avc, AV_LOG_WARNING, "If you want to help, upload a sample "
 -            "of this file to ftp://upload.libav.org/incoming/ "
 -            "and contact the libav-devel mailing list.\n");
 +            "of this file to ftp://upload.ffmpeg.org/MPlayer/incoming/ "
 +            "and contact the ffmpeg-devel mailing list.\n");
+     va_end(argument_list);
  }
  
  static AVHWAccel *first_hwaccel = NULL;
Simple merge
Simple merge
Simple merge