diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:19:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:20:37 +0200 |
| commit | 73b8155b31ec7ad1132ecf5c45ac82acadeb28e5 (patch) | |
| tree | b9da7fb113c4271fbd693d9bc3f61971dfa15b15 /libavformat/nutdec.c | |
| parent | 8b0ceb96da0e615e6c7e6ed11da5035c0506dadb (diff) | |
| parent | 4d0ee4962be7e07cdc038a78008ef2e4e47e5f81 (diff) | |
| download | ffmpeg-73b8155b31ec7ad1132ecf5c45ac82acadeb28e5.tar.gz | |
Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'
* commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81':
avi: Validate sample_size
Conflicts:
libavformat/avidec.c
See: ca234639ac49a0dc073ac1f10977979acdb94f97
See: c7369f3a4bd21ea64571c1b0c4fcbf39f8daf68c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutdec.c')
0 files changed, 0 insertions, 0 deletions