Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ffmpeg: Don't trigger url_interrupt_cb on the first signal
  avoptions: Check the return value from av_get_number
  dct32_sse: eliminate some spills
  Fix dct32() compilation with --disable-yasm

Conflicts:
	ffmpeg.c

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

diff --cc libavcodec/x86/dct32_sse.asm
Simple merge

diff --cc libavcodec/x86/fmtconvert.asm
Simple merge

diff --cc libavcodec/x86/x86util.asm
Simple merge

diff --cc libavutil/opt.c
Simple merge