[FFmpeg-cvslog] Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 30 22:29:34 2015 +0200| [8e6c5c4322367ab066bbb0134eac5ee9c1aafdc3] | committer: Michael Niedermayer

Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091'

* commit '0bfab80a0d9fce0180e8aa2a947267f89b725091':
  h264_sei: Group error check outside the switch block

Conflicts:
	libavcodec/h264_sei.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e6c5c4322367ab066bbb0134eac5ee9c1aafdc3
---