diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-05 11:35:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-05 11:35:39 +0200 |
| commit | 922596e3dac8a9a8ed6a6738c7085e70dfef8ff3 (patch) | |
| tree | 21fd350bf23fdd817eeb2c24f426762dc757a8b1 /libavcodec/libfdk-aacdec.c | |
| parent | 47a57c6832d008f676837a9ee5f3a45b828c9ca1 (diff) | |
| parent | a4435f9235eefac8a25f1cda471486e2c37b21b5 (diff) | |
| download | ffmpeg-922596e3dac8a9a8ed6a6738c7085e70dfef8ff3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ismindex: Change the duration field to int64_t
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacdec.c')
0 files changed, 0 insertions, 0 deletions