Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jan 2012 01:07:42 +0000 (02:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jan 2012 01:08:12 +0000 (02:08 +0100)
commite191f1f4141aec6b40d12af4835844deca134a1e
treef50a57ec102a0c0902512b1535124515510baf0a
parent140a9afcf284123f3967060c6c7ef8105484bca6
parent01ed1c390d8376ba5fac278ceee044bb03a58804
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>
avconv.c
ffmpeg.c
libavcodec/tta.c