Michael Niedermayer 65b8527993 Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a' ...

* commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a':
  idcinvideo: correctly set AVFrame defaults
  yadif: Port inline assembly to yasm
  au: remove unnecessary casts
  au: return AVERROR codes instead of -1

Conflicts:
	libavcodec/idcinvideo.c
	libavfilter/x86/yadif_template.c
	libavformat/au.c

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

2013-01-10 12:27:16 +01:00

..

af_volume_init.c

Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

2012-12-06 15:55:47 +01:00

af_volume.asm

Fix compilation with yasm 0.6.2.

2012-12-07 00:26:45 +01:00

gradfun.c

lavfi/gradfun: remove rounding to match C and SSE code.

2012-12-19 03:13:25 +01:00

hqdn3d.asm

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

Makefile

yadif: Port inline assembly to yasm

2013-01-09 18:41:02 +01:00

yadif_init.c

Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'

2013-01-10 12:27:16 +01:00

yadif.asm

Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'

2013-01-10 12:27:16 +01:00