diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 14:10:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 14:10:06 +0200 |
| commit | 27e8298c037587d88a3bda1c97caf2351e2e3243 (patch) | |
| tree | cc0f76ed014a5f117de6430c2affc83d34fd7888 /common.mak | |
| parent | 67d5d97cdcd7ada748320edf34453d94668a67c6 (diff) | |
| parent | 94aefb1932be882fd93f66cf790ceb19ff575c19 (diff) | |
| download | ffmpeg-27e8298c037587d88a3bda1c97caf2351e2e3243.tar.gz | |
Merge commit '94aefb1932be882fd93f66cf790ceb19ff575c19'
* commit '94aefb1932be882fd93f66cf790ceb19ff575c19':
4xm: do not overread the source buffer in decode_p_block
Conflicts:
libavcodec/4xm.c
The checks are replaced by av_assert0() as the conditions should
be impossible. If these asserts fail, there is a bug elsewhere
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions