Merge commit '7585a6254bbb38148e4467793fc34211b79d5f7d' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:41:27 +0000 (19:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:41:51 +0000 (19:41 +0200)
commit0a83007ceee404f9bfdcfc3feb780ace58738eaf
treef5e895f760594436a308e86abb50a7c8a69785b9
parent330791c2ae2b7a10147add181373c11984c7284b
parent7585a6254bbb38148e4467793fc34211b79d5f7d
Merge commit '7585a6254bbb38148e4467793fc34211b79d5f7d' into release/0.10

* commit '7585a6254bbb38148e4467793fc34211b79d5f7d':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
libavcodec/h264_sei.c

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