FFmpeg/libavutil
Michael Niedermayer 8772156be0 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: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
	libavcodec/h264.c
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-22 03:54:30 +02:00
..
arm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avr32 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
bfin Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mips Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc Merge remote branch 'qatar/master' 2011-04-11 04:08:08 +02:00
sh4 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tomi Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
adler32.c Replace many includes of libavutil/common.h with what is actually needed 2010-03-09 17:39:19 +00:00
adler32.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
aes.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
aes.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
attributes.h Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
audioconvert.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
audioconvert.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avassert.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avstring.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avstring.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avutil.h Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
base64.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
base64.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
bswap.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
colorspace.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
common.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
cpu.c Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
cpu.h Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
crc_data.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
crc.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
crc.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
des.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
des.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
error.c Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
error.h Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
eval.c lavu: remove FF_API_OLD_EVAL_NAMES cruft 2011-04-19 19:03:44 +02:00
eval.h lavu: remove FF_API_OLD_EVAL_NAMES cruft 2011-04-19 19:03:44 +02:00
fifo.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fifo.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
file.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
file.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
imgutils.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
imgutils.h Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
integer.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
integer.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
internal.h Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
intfloat_readwrite.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intfloat_readwrite.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intmath.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intreadwrite.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
inverse.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lfg.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lfg.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavutil.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
libm.h Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
lls.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lls.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
log.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
log.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lzo.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lzo.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
Makefile lavu: remove disabled sha1 cruft. 2011-04-19 21:50:10 +02:00
mathematics.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mathematics.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
md5.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
md5.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mem.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
mem.h Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
opt.c Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
opt.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
parseutils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
parseutils.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pca.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pca.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pixdesc.c Add pixel formats for 9- and 10-bit yuv420p. 2011-04-10 22:33:41 +02:00
pixdesc.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pixfmt.h Fix BE/LE order of pix formats 2011-04-14 22:35:23 +02:00
random_seed.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
random_seed.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rational.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rational.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rc4.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rc4.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
samplefmt.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
samplefmt.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
sha.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
sha.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
softfloat.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
softfloat.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
timer.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tree.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tree.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
utils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86_cpu.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00