Merge commit '184c79729d4011f33027bcdc61a63d521017ebc1' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:30:07 +0000 (19:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:30:07 +0000 (19:30 +0200)
commit330791c2ae2b7a10147add181373c11984c7284b
treef5e895f760594436a308e86abb50a7c8a69785b9
parent5404bf29c3b720ef04314c50b18047a94e4534b6
parent184c79729d4011f33027bcdc61a63d521017ebc1
Merge commit '184c79729d4011f33027bcdc61a63d521017ebc1' into release/0.10

* commit '184c79729d4011f33027bcdc61a63d521017ebc1':
  h264_sei: check SEI size

Conflicts:
libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_sei.c