diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-09 08:44:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-09 09:10:20 +0200 |
| commit | bf312714786a4018e9bf1c7f4c5444d906ae0a37 (patch) | |
| tree | 695ec5ca8bed836a9e9fcc7a22f3c0b9b901f517 /libavformat/mkvtimestamp_v2.c | |
| parent | 8715ca0b82c1a1cc2ec9998acca990bbe63d4a34 (diff) | |
| parent | 4d073ddac95d789f23c3ee6f7b5348599b39f047 (diff) | |
| download | ffmpeg-bf312714786a4018e9bf1c7f4c5444d906ae0a37.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
Update Changelog
Prepare for 9.9 RELEASE
lavf: fix the comparison in an overflow check
dv: Add a guard to not overread the ppcm array
nuv: check ff_rtjpeg_decode_frame_yuv420 return value
Conflicts:
Changelog
RELEASE
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mkvtimestamp_v2.c')
0 files changed, 0 insertions, 0 deletions