Michael Niedermayer e9d5a6f1c5 Merge commit '327ff82bac3081d918dceb4931c77e25d0a1480d' into release/0.10 ...

* commit '327ff82bac3081d918dceb4931c77e25d0a1480d':
  msrle: convert MS RLE decoding function to bytestream2.
  Update Changelog for the 0.8.6 Release
  wmaprodec: require block_align to be set.
  ivi_common: do not call MC for intra frames when dc_transform is unset
  roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
  Revert "libmp3lame: use the correct remaining buffer size when flushing"
  lzo: fix overflow checking in copy_backptr()
  flacdec: simplify bounds checking in flac_probe()
  atrac3: avoid oversized shifting in decode_bytes()
  avconv: skip attached files when selecting streams to read from.
  lavf: fix arithmetic overflows in avformat_seek_file()

Conflicts:
	Changelog
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/msrledec.c
	libavformat/utils.c

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

2013-04-07 15:42:45 +02:00

..

arm

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

avr32

…

bfin

…

mips

…

ppc

…

sh4

…

tomi

…

x86

x86inc: remove duplicate movlhps

2012-01-10 23:12:18 +01:00

adler32.c

Merge remote-tracking branch 'qatar/master'

2011-12-09 00:05:51 +01:00

adler32.h

…

aes.c

Merge remote-tracking branch 'qatar/master'

2011-12-22 01:51:53 +01:00

aes.h

…

attributes.h

…

audioconvert.c

lavu: add 2.1 channel layout.

2012-01-16 17:38:23 +01:00

audioconvert.h

Merge remote-tracking branch 'qatar/master'

2011-12-10 02:01:03 +01:00

avassert.h

…

avstring.c

…

avstring.h

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

avutil.h

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

2012-03-16 09:01:08 +01:00

base64.c

base64: 10l endian fix.

2012-01-22 23:06:04 +01:00

base64.h

…

bswap.h

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

colorspace.h

…

common.h

Merge remote-tracking branch 'qatar/master'

2012-01-04 01:12:34 +01:00

cpu.c

…

cpu.h

…

crc_data.h

…

crc.c

…

crc.h

…

des.c

…

des.h

…

dict.c

…

dict.h

…

error.c

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

2012-03-16 09:01:08 +01:00

error.h

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

2012-03-16 09:01:08 +01:00

eval.c

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

2012-10-16 04:25:51 +02:00

eval.h

Merge remote-tracking branch 'qatar/master'

2011-12-12 01:25:37 +01:00

fifo.c

fifo: Make writes atomic.

2011-12-23 00:18:36 +01:00

fifo.h

…

file.c

av_tempfile: fix leak in error case

2012-10-25 21:09:21 +02:00

file.h

…

imgutils.c

Make systematic palette opaque.

2011-12-23 11:43:29 +01:00

imgutils.h

…

integer.c

…

integer.h

…

internal.h

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

intfloat_readwrite.c

…

intfloat_readwrite.h

Merge remote-tracking branch 'qatar/master'

2011-12-12 01:25:37 +01:00

intfloat.h

lavu: replace int/float punning functions

2011-12-11 18:47:19 +00:00

intmath.h

…

intreadwrite.h

…

inverse.c

…

lfg.c

…

lfg.h

…

libavutil.v

…

libm.h

…

lls.c

…

lls.h

…

log.c

log: use a different color for debug (green).

2012-01-09 22:35:45 +01:00

log.h

lavu: introduce av_log_format_line.

2011-12-08 18:47:47 +01:00

lzo.c

Merge commit '327ff82bac3081d918dceb4931c77e25d0a1480d' into release/0.10

2013-04-07 15:42:45 +02:00

lzo.h

Avoid uninitialized data in lcldec when ofs is 0 in MSZH.

2011-12-31 16:31:15 +01:00

Makefile

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

2012-03-16 09:01:08 +01:00

mathematics.c

…

mathematics.h

…

md5.c

…

md5.h

…

mem.c

mem: add av_max_alloc() to limit the maximum amount that may be allocated in one piece

2011-12-25 18:55:43 +01:00

mem.h

mem: add av_max_alloc() to limit the maximum amount that may be allocated in one piece

2011-12-25 18:55:43 +01:00

opt.c

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

2013-01-17 02:33:07 +01:00

opt.h

…

parseutils.c

…

parseutils.h

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

pca.c

…

pca.h

…

pixdesc.c

pixdesc: cosmetics

2012-01-22 00:46:19 +01:00

pixdesc.h

…

pixfmt.h

…

random_seed.c

…

random_seed.h

…

rational.c

…

rational.h

…

rc4.c

…

rc4.h

…

samplefmt.c

…

samplefmt.h

…

sha.c

…

sha.h

…

softfloat.c

…

softfloat.h

…

timer.h

Merge remote-tracking branch 'qatar/master'

2012-01-06 02:45:12 +01:00

tree.c

…

tree.h

…

utils.c

libavutil: increase LIBAVUTIL_VERSION_MICRO to 100

2011-12-22 03:01:17 +01:00

x86_cpu.h

…