[FFmpeg-cvslog] Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 10 12:26:28 2013 +0100| [65b8527993a1737eccc2820f27ed6bf10b63af5f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65b8527993a1737eccc2820f27ed6bf10b63af5f
---