diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-05-18 11:36:33 +0300 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-06-21 12:17:28 +0300 |
| commit | 5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c (patch) | |
| tree | 15872b880e486a2e536a25c450799b1b1624ea32 /libavcodec/h264_parse.c | |
| parent | 1cf2f3d334f52849aae2be868bad1e5fa5f59aa0 (diff) | |
h264: add H264_ prefix to the NAL unit types
This will prevent conflicts e.g. in code that deals with both h264 and
hevc.
Diffstat (limited to 'libavcodec/h264_parse.c')
| -rw-r--r-- | libavcodec/h264_parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 0aa6f09b72..d694558ecc 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -330,12 +330,12 @@ static int decode_extradata_ps(const uint8_t *data, int size, H264ParamSets *ps, for (i = 0; i < pkt.nb_nals; i++) { H2645NAL *nal = &pkt.nals[i]; switch (nal->type) { - case NAL_SPS: + case H264_NAL_SPS: ret = ff_h264_decode_seq_parameter_set(&nal->gb, logctx, ps); if (ret < 0) goto fail; break; - case NAL_PPS: + case H264_NAL_PPS: ret = ff_h264_decode_picture_parameter_set(&nal->gb, logctx, ps, nal->size_bits); if (ret < 0) |