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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 18 02:07:42 2012 +0100| [e191f1f4141aec6b40d12af4835844deca134a1e] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  tta: cast output data pointer to the correct type
  avconv: fix -frames for video encoders with delay.

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

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