[FFmpeg-cvslog] Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 18 13:36:39 2013 +0100| [17596198cacbb7277f1d9641f0a76fe62ebf155d] | committer: Michael Niedermayer

Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'

* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
  lavc: support ZenoXVID custom tag
  libcdio: support recent cdio-paranoia
  float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
  theora: Skip zero-sized headers

Conflicts:
	configure

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

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