diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-08 12:14:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-08 12:29:07 +0200 |
| commit | 53fb52ac859c1c1f81a87336b1f40ac6226b3976 (patch) | |
| tree | b3b05345ab87065c87a4fd3a6652b0fe19259254 /libavformat/subtitles.c | |
| parent | 13e35a25f6703a68cfede58e5e6ae455caaee8c3 (diff) | |
| parent | 26f027fba1c5ab482fa2488fbe0fa36c8bb33b69 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: fix the comparison in an overflow check
Conflicts:
libavformat/utils.c
See: a5d67bc796e1f9a2b99b43ea807166b655e4bdbc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/subtitles.c')
0 files changed, 0 insertions, 0 deletions