]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 67d5d97 94aefb1)
Merge commit '94aefb1932be882fd93f66cf790ceb19ff575c19'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 12:10:06 +0000 (14:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 12:10:06 +0000 (14:10 +0200)
commit27e8298c037587d88a3bda1c97caf2351e2e3243
treecc0f76ed014a5f117de6430c2affc83d34fd7888tree | snapshot
parent67d5d97cdcd7ada748320edf34453d94668a67c6commit | diff
parent94aefb1932be882fd93f66cf790ceb19ff575c19commit | diff
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>
libavcodec/4xm.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.