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 | |
| 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>
| -rw-r--r-- | libavcodec/h264.h | 2 | ||||
| -rw-r--r-- | libavcodec/h264_sei.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index a744ac2647..840a91d35b 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -123,7 +123,7 @@ enum { * SEI message types */ typedef enum { - SEI_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1) + SEI_TYPE_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1) SEI_TYPE_PIC_TIMING = 1, ///< picture timing SEI_TYPE_USER_DATA_ITU_T_T35 = 4, ///< user data registered by ITU-T Recommendation T.35 SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data 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; |