ffmpeg/libavutil
Michael Niedermayer b81f8880e0 Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
  fix AC3ENC_OPT_MODE_ON/OFF
  h264: fix HRD parameters parsing
  prores: implement multithreading.
  prores: idct sse2/sse4 optimizations.
  swscale: use aligned move for storage into temporary buffer.
  prores: extract idct into its own dspcontext and merge with put_pixels.
  h264: fix invalid shifts in init_cavlc_level_tab()
  intfloat_readwrite: fix signed addition overflows
  mov: do not misreport empty stts
  mov: cosmetics, fix for and if spacing
  id3v2: fix NULL pointer dereference
  mov: read album_artist atom
  mov: fix disc/track numbers and totals
  doc: fix references to obsolete presets directories for avconv/ffmpeg
  flashsv: return more meaningful error value
  flashsv: fix typo in av_log() message
  smacker: validate channels and sample format.
  smacker: check buffer size before reading output size
  smacker: validate number of channels
  smacker: Separate audio flags from sample rates in smacker demuxer.
  ...

Conflicts:
	cmdutils.h
	doc/ffmpeg.texi
	libavcodec/Makefile
	libavcodec/motion_est_template.c
	libavformat/id3v2.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-12 05:40:57 +02:00
..
arm arm: fix av_clipl_int32() asm 2011-10-11 20:25:55 +02:00
avr32
bfin
mips
ppc Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
adler32.c adler32: whitespace cosmetics 2011-06-30 16:50:27 +01:00
adler32.h
aes.c Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
aes.h
attributes.h lavu/attributes: introduce AV_NOWARN_DEPRECATED. 2011-09-25 11:18:41 +02:00
audioconvert.c audioconvert: fix type of av_get_default_channel_layout 2011-10-07 02:53:18 +02:00
audioconvert.h audioconvert: fix type of av_get_default_channel_layout 2011-10-07 02:53:18 +02:00
avassert.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
avstring.c av_string: add av_asprintf(). 2011-09-04 09:37:41 +02:00
avstring.h av_string: add av_asprintf(). 2011-09-04 09:37:41 +02:00
avutil.h lavu: bump micro after gcd(), random(), and hypot() additions in eval 2011-10-09 15:58:10 +02:00
base64.c
base64.h
bswap.h
colorspace.h
common.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
cpu.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
cpu.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
crc.c Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
crc.h
crc_data.h
des.c Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
des.h Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
dict.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
dict.h Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
error.c error.c: fix compile flags 2011-05-30 03:11:54 +02:00
error.h
eval.c eval: fix () bug in not. 2011-10-09 02:04:54 +02:00
eval.h
fifo.c Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
fifo.h fifo: add note in av_fifo_realloc2() doxy regarding reallocation failure behavior 2011-08-30 10:03:13 +02:00
file.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
file.h Merge remote-tracking branch 'qatar/master' 2011-07-02 03:24:32 +02:00
imgutils.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
imgutils.h Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
integer.c avutil: Remove unused arbitrary precision integer code. 2011-06-28 13:14:46 +02:00
integer.h avutil: Remove unused arbitrary precision integer code. 2011-06-28 13:14:46 +02:00
internal.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
intfloat_readwrite.c Merge remote-tracking branch 'qatar/master' 2011-10-12 05:40:57 +02:00
intfloat_readwrite.h
intmath.h
intreadwrite.h Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
inverse.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
lfg.c
lfg.h Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
libavutil.v
libm.h
lls.c Merge remote-tracking branch 'qatar/master' 2011-07-12 01:42:32 +02:00
lls.h
log.c
log.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
lzo.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
lzo.h Merge remote-tracking branch 'qatar/master' 2011-07-03 03:14:10 +02:00
mathematics.c Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
mathematics.h
md5.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
md5.h
mem.c mem: fix memalign hack av_realloc() 2011-10-11 22:03:19 +02:00
mem.h Introduce av_realloc_f. 2011-09-28 18:13:52 +02:00
opt.c Merge remote-tracking branch 'qatar/master' 2011-10-11 03:42:43 +02:00
opt.h Merge remote-tracking branch 'qatar/master' 2011-10-11 03:42:43 +02:00
parseutils.c parseutils: add some documentation for small_strptime() 2011-07-23 17:01:28 +02:00
parseutils.h Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
pca.c Remove unused, never built libavutil/pca.[ch] 2011-06-29 23:49:03 +01:00
pca.h Remove unused, never built libavutil/pca.[ch] 2011-06-29 23:49:03 +01:00
pixdesc.c pixdesc: fix gbr24p 2011-10-09 02:04:54 +02:00
pixdesc.h pixdesc: remove duplicated header inclusion 2011-06-06 11:34:45 +02:00
pixfmt.h Start adding pixel definitions for planar rgb. 2011-10-08 23:19:14 +02:00
random_seed.c Merge remote-tracking branch 'qatar/master' 2011-07-18 16:43:46 +02:00
random_seed.h avutil: elaborate documentation for av_get_random_seed 2011-06-30 21:19:16 +02:00
rational.c Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
rational.h
rc4.c
rc4.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
samplefmt.c samplefmt: remove deprecated use of av_get_bits_per_sample_fmt() 2011-06-25 22:06:30 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
sha.c Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
sha.h
softfloat.c Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
softfloat.h Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
timer.h Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
tree.c
tree.h
utils.c lavu: add av_get_media_type_string() convenience function 2011-08-20 14:20:25 +02:00
x86_cpu.h