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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  6 21:47:55 2013 +0200| [b3e9fd1fe5786672c5d53e91f518419d05598ea4] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Use alpha from the right row in yuva2rgba_c

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

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