[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  4 20:59:29 2011 +0200| [84a6abd95420f6552c30b11ab5585fdb306269ba] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  applehttp: fix variant discard logic
  h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.

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

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