Michael Niedermayer e191f1f414 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@gmx.at>

2012-01-18 02:08:12 +01:00

14 KiB

Raw Blame History

View Raw