aboutsummaryrefslogtreecommitdiffstats
path: root/ffpresets
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-18 02:07:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-18 02:08:12 +0100
commite191f1f4141aec6b40d12af4835844deca134a1e (patch)
treef50a57ec102a0c0902512b1535124515510baf0a /ffpresets
parent140a9afcf284123f3967060c6c7ef8105484bca6 (diff)
parent01ed1c390d8376ba5fac278ceee044bb03a58804 (diff)
downloadffmpeg-e191f1f4141aec6b40d12af4835844deca134a1e.tar.gz
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>
Diffstat (limited to 'ffpresets')
0 files changed, 0 insertions, 0 deletions