diff options
| author | James Almer <jamrial@gmail.com> | 2016-08-01 15:11:05 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-08-01 15:11:05 -0300 |
| commit | f41048f6ec5671c2e09ae317cecc1e98ecc3c2ce (patch) | |
| tree | 6a592b4d93164256410d27cf46e8da427b741bc4 /libavcodec/h264.h | |
| parent | 12759cc0345cec5a418d8caec5435297d1ec04b2 (diff) | |
| parent | 5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c (diff) | |
| download | ffmpeg-f41048f6ec5671c2e09ae317cecc1e98ecc3c2ce.tar.gz | |
Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c'
* commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c':
h264: add H264_ prefix to the NAL unit types
Conflicts:
libavcodec/h264_parse.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
libavcodec/h264dec.c
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index bcdd4f69dd..86df5eb9b3 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -28,20 +28,20 @@ /* NAL unit types */ enum { - NAL_SLICE = 1, - NAL_DPA = 2, - NAL_DPB = 3, - NAL_DPC = 4, - NAL_IDR_SLICE = 5, - NAL_SEI = 6, - NAL_SPS = 7, - NAL_PPS = 8, - NAL_AUD = 9, - NAL_END_SEQUENCE = 10, - NAL_END_STREAM = 11, - NAL_FILLER_DATA = 12, - NAL_SPS_EXT = 13, - NAL_AUXILIARY_SLICE = 19, + H264_NAL_SLICE = 1, + H264_NAL_DPA = 2, + H264_NAL_DPB = 3, + H264_NAL_DPC = 4, + H264_NAL_IDR_SLICE = 5, + H264_NAL_SEI = 6, + H264_NAL_SPS = 7, + H264_NAL_PPS = 8, + H264_NAL_AUD = 9, + H264_NAL_END_SEQUENCE = 10, + H264_NAL_END_STREAM = 11, + H264_NAL_FILLER_DATA = 12, + H264_NAL_SPS_EXT = 13, + H264_NAL_AUXILIARY_SLICE = 19, }; #endif /* AVCODEC_H264_H */ |