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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 22 14:50:00 2012 +0200| [f9cf14c8da2a6af4ee8524ca950f644a0b081866] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  riff: remove a write-only variable
  lavc: extend frame_size doxy.
  alacdec: set bits_per_raw_sample

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

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