Merge commit '066ad249843bde656265b59110c2521e2b1ce131'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:17:35 +0000 (14:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:18:04 +0000 (14:18 +0100)
commita062bee1c12721ab460e2adee5b50dc2bd25efef
tree0de83ff7a5837682b08022e710c03827272c66d0
parent1d91af5abae8966537f68817b3788909185dfda4
parent066ad249843bde656265b59110c2521e2b1ce131
Merge commit '066ad249843bde656265b59110c2521e2b1ce131'

* commit '066ad249843bde656265b59110c2521e2b1ce131':
  h264_sei: reorder headers

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