diff options
| author | Michael Niedermayer <[email protected]> | 2011-05-07 04:14:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2011-05-07 04:14:09 +0200 |
| commit | e5a85164b100620fe529bae0ce623956f0bab2e9 (patch) | |
| tree | 4732dbaa6666e2448c33a32956b074f51105243d /ffmpeg.c | |
| parent | c60d2be5510044edf01d813363e39841db3d751a (diff) | |
| parent | 45a811b512b47acf060247ad0bc7022cada5533b (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
mov: fix composition timestamps on movie fragments.
wmavoice: Use proper size in memeset().
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions