eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

h264: add H264_ prefix to the NAL unit types

Browse source 
This will prevent conflicts e.g. in code that deals with both h264 and
hevc.
This commit is contained in:
Anton Khirnov 2016-05-18 10:36:33 +02:00
parent 1cf2f3d334
commit 5c2fb561d9
8 changed files with 65 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavcodec/h264_parse.c
View file

@ -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)