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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 28 00:14:40 2011 +0200| [3dd44e507536e85d81e4f10d1a9bf8fc6082d9ab] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Use deinterleavers for demangling audio packets in RealMedia.
  vf_scale: don't leak SWS context.
  doxygen: drop another pointless star from pointer variable name

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

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