Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 May 2011 02:16:08 +0000 (04:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 May 2011 02:29:51 +0000 (04:29 +0200)
* 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>
1  2 
libavcodec/x86/dct32_sse.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/x86util.asm
libavutil/opt.c

Simple merge
Simple merge
Simple merge
diff --cc libavutil/opt.c
Simple merge