Merge commit '304e916a92bc17385a485bec2f957e192257ddb6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:12:28 +0000 (14:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:13:06 +0000 (14:13 +0100)
commit1d91af5abae8966537f68817b3788909185dfda4
tree0751b8e4375529056d8d5965f3a1d48fdd9de50b
parenta7eb93b3671f62a578ce295e792a955a30e8e7a5
parent304e916a92bc17385a485bec2f957e192257ddb6
Merge commit '304e916a92bc17385a485bec2f957e192257ddb6'

* commit '304e916a92bc17385a485bec2f957e192257ddb6':
  h264_sei: name buffering period type consistently

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