Michael Niedermayer 3b0bb321a5 Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' ...

* commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507':
  avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
  rtspdec: Set the default port for listen mode, if none is specified
  tscc2: Fix an out of array access
  rtmpproto: Fix an out of array write
  rtspdec: Fix use of uninitialized byte
  vp8: reset loopfilter delta values at keyframes.
  avutil: add yuva422p and yuva444p formats

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

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

2012-10-13 14:14:11 +02:00

..

gradfun.c

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

hqdn3d.asm

hqdn3d: Fix out of array read in LOWPASS

2012-09-22 03:17:28 +02:00

Makefile

avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)

2012-10-12 19:58:51 +02:00

yadif_template.c

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

yadif.c

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00