diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 14:12:28 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 14:13:06 +0100 |
commit | 1d91af5abae8966537f68817b3788909185dfda4 (patch) | |
tree | 0751b8e4375529056d8d5965f3a1d48fdd9de50b /libavcodec/h264_sei.c | |
parent | a7eb93b3671f62a578ce295e792a955a30e8e7a5 (diff) | |
parent | 304e916a92bc17385a485bec2f957e192257ddb6 (diff) | |
download | ffmpeg-1d91af5abae8966537f68817b3788909185dfda4.tar.gz |
Merge commit '304e916a92bc17385a485bec2f957e192257ddb6'
* commit '304e916a92bc17385a485bec2f957e192257ddb6':
h264_sei: name buffering period type consistently
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_sei.c')
-rw-r--r-- | libavcodec/h264_sei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 12d709b123..3acd0ccd28 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -312,7 +312,7 @@ int ff_h264_decode_sei(H264Context *h) if (ret < 0) return ret; break; - case SEI_BUFFERING_PERIOD: + case SEI_TYPE_BUFFERING_PERIOD: ret = decode_buffering_period(h); if (ret < 0) return ret; |