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_parse.c | |
| parent | 12759cc0345cec5a418d8caec5435297d1ec04b2 (diff) | |
| parent | 5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c (diff) | |
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_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 da67149aa1..1d4b1e4d82 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -346,12 +346,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, 0); 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) |