diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-18 02:07:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-18 02:08:12 +0100 |
| commit | e191f1f4141aec6b40d12af4835844deca134a1e (patch) | |
| tree | f50a57ec102a0c0902512b1535124515510baf0a /libavcodec/proresdec_lgpl.c | |
| parent | 140a9afcf284123f3967060c6c7ef8105484bca6 (diff) | |
| parent | 01ed1c390d8376ba5fac278ceee044bb03a58804 (diff) | |
| download | ffmpeg-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 'libavcodec/proresdec_lgpl.c')
0 files changed, 0 insertions, 0 deletions