diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:52:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:52:02 +0100 |
| commit | 56ca871fb3d6c60a97ac678a919d8253fcb3ebdd (patch) | |
| tree | 9c8adfbeff37d6389c987512b6d02a3699c12370 /arch.mak | |
| parent | a0dbe2a58cf5c4c635df238e1d1f680120d5a6bc (diff) | |
| parent | 5d0450461ff729be5f531d333d29754155e406c5 (diff) | |
| download | ffmpeg-56ca871fb3d6c60a97ac678a919d8253fcb3ebdd.tar.gz | |
Merge commit '5d0450461ff729be5f531d333d29754155e406c5'
* commit '5d0450461ff729be5f531d333d29754155e406c5':
idcin: better error handling
idcin: check for integer overflow when calling av_get_packet()
Conflicts:
libavformat/idcin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions