* qatar/master:
  tta: cast output data pointer to the correct type
  avconv: fix -frames for video encoders with delay.
Merged-by: Michael Niedermayer <michaelni@gmx.at>