From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 23 May 2011 02:16:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: n0.8~329
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=01a73d6cef70dfa90fdf79f7afd55b817b4c9342;p=coroid%2Fffmpeg_saccubus.git

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>
---

01a73d6cef70dfa90fdf79f7afd55b817b4c9342