[FFmpeg-cvslog] Merge remote branch 'qatar/master'

Michael Niedermayer git at videolan.org
Fri Apr 22 03:58:46 CEST 2011

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 22 03:50:23 2011 +0200| [8772156be0725fd20d948a855616fe155fafdc09] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c


Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8772156be0725fd20d948a855616fe155fafdc09

More information about the ffmpeg-cvslog mailing list