diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 00:32:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 00:32:01 +0200 |
| commit | 143a19f5c73b95c177aa03dd41ce85e03e2d13c2 (patch) | |
| tree | 70b3df9873ceb45af2a369329e6eb276c00e7ea6 /libavcodec/pngdec.c | |
| parent | ccb6b056df35337b37e8083b15127fa466cd64f7 (diff) | |
| parent | c231987662194d009dd91bfc57c678e0e70ca161 (diff) | |
Merge commit 'c231987662194d009dd91bfc57c678e0e70ca161'
* commit 'c231987662194d009dd91bfc57c678e0e70ca161':
mov: Make sure the read sample count is nonnegative
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngdec.c')
0 files changed, 0 insertions, 0 deletions