Merge commit '2273e5ed992661e0c4b37208e792e2253d5a0b5b' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 01:55:01 +0000 (03:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 01:55:15 +0000 (03:55 +0200)
commit188ce941ec01c3292609055d338ec51525e07b34
treedd5d2d2f0d39557e6e4bd27a768f59cd53386880
parent7fc9c7c35b1796040d4b8e11c5055cc820f79615
parent2273e5ed992661e0c4b37208e792e2253d5a0b5b
Merge commit '2273e5ed992661e0c4b37208e792e2253d5a0b5b' into release/2.2

* commit '2273e5ed992661e0c4b37208e792e2253d5a0b5b':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
libavcodec/h264_sei.c

See: 9decfc17bb76da34734296048d390b176abf404c
Merged-by: Michael Niedermayer <michaelni@gmx.at>