diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-09 11:06:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-09 11:06:28 +0200 |
| commit | 01580c0955f9fba6a1a04b85eaa2f2ec5e234bf6 (patch) | |
| tree | 53a3afc35b316c74018be1781ae82983dc6a7a28 /libavcodec/truespeech.c | |
| parent | 2fae70db2ac2ffaf7968637fe4f111a24e7e4351 (diff) | |
| parent | 8eb7c2566ca20392315618cda4a635b19cbb8e21 (diff) | |
| download | ffmpeg-01580c0955f9fba6a1a04b85eaa2f2ec5e234bf6.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
tiff: do not overread the source buffer
apetag: use int64_t for filesize
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/truespeech.c')
0 files changed, 0 insertions, 0 deletions