Merge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 22:19:27 +0000 (23:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 22:21:12 +0000 (23:21 +0100)
commit940f5c08e5125fd2ef235229aca504708ff282f0
tree0f50132a578d1b59ffc579c01632e6cfddefba69
parent69b2d43d6afee6d8e11c09d74c6b5aa375304a1c
parent1b667269062eb6aec0b8726393ea91b7f7f57fde
Merge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde'

* commit '1b667269062eb6aec0b8726393ea91b7f7f57fde':
  h264_parser: don't stop on SPS_EXT in split

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