Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 20:29:34 +0000 (22:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 20:29:34 +0000 (22:29 +0200)
commit8e6c5c4322367ab066bbb0134eac5ee9c1aafdc3
treeff10257ad3c32745083005c0a23f6e58b0b46431
parent2a227fe8799e26fe3c8862438a163f72dca017a5
parent0bfab80a0d9fce0180e8aa2a947267f89b725091
Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091'

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

Conflicts:
libavcodec/h264_sei.c

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