diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-05 06:02:23 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-05 06:02:34 +0400 |
| commit | bfb5ba8495e19f6078bb5bd42ea5793355da5e28 (patch) | |
| tree | 0952604dcac1373eb654a83c6cb0dea251d5ee4d /ffmpeg.c | |
| parent | 7e850f1cd053066bf06e772ca79ad95c99d9b6b3 (diff) | |
| parent | 86b57e4efea649246d882fcfdfa02e148a736496 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ape: fix seeking
apedec: 8bit and 24bit support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions