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)
* commit '1b667269062eb6aec0b8726393ea91b7f7f57fde':
  h264_parser: don't stop on SPS_EXT in split

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

Simple merge