diff options
| author | Michael Niedermayer <[email protected]> | 2015-05-19 21:24:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-05-19 21:24:51 +0200 |
| commit | 9005075f397bc7bd2fa2e193f62cbf971bdaa4d4 (patch) | |
| tree | e9d93f30e7effe182c305a136d5abe959bc3ad92 /libavutil/fixed_dsp.h | |
| parent | 9f4979b24c9a455b1ef16ee97dfeb21e4cfde1ba (diff) | |
| parent | a55a70644872027fdf76a75edf12a09c9008880f (diff) | |
Merge commit 'a55a70644872027fdf76a75edf12a09c9008880f' into release/2.4
* commit 'a55a70644872027fdf76a75edf12a09c9008880f':
avi: Validate sample_size
Conflicts:
libavformat/avidec.c
See: ca234639ac49a0dc073ac1f10977979acdb94f97
See: c7369f3a4bd21ea64571c1b0c4fcbf39f8daf68c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/fixed_dsp.h')
0 files changed, 0 insertions, 0 deletions