Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 11:26:28 +0000 (12:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 11:27:16 +0000 (12:27 +0100)
commit65b8527993a1737eccc2820f27ed6bf10b63af5f
treefcb0260594c58c9bb05d5a4e6a9294b6e38184bd
parent8c7de73e20ebd0435f7ddd75d57ffb7179c40b77
parentf7bf72a4a1146a7583577c9bdc066767e1ba3c6a
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>
libavcodec/idcinvideo.c
libavfilter/x86/yadif.asm
libavfilter/x86/yadif_init.c
libavformat/au.c