Skip to content
Snippets Groups Projects
Commit 9d4cb45d authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Cleanup 'Fix spurious warning when stream has SPS and PPS units.' 

Signed-off-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parent d0df2934
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
libavcodec/h264_mp4toannexb_bsf.c
+ 2
− 6
View file @ 9d4cb45d
...@@ -87,11 +87,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc, ...@@ -87,11 +87,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
/* retrieve sps and pps unit(s) */ /* retrieve sps and pps unit(s) */
unit_nb = *extradata++ & 0x1f; /* number of sps unit(s) */ unit_nb = *extradata++ & 0x1f; /* number of sps unit(s) */
if (!unit_nb) { if (!unit_nb) {
unit_nb = *extradata++; /* number of pps unit(s) */ goto pps;
sps_done++;
if (unit_nb)
pps_seen = 1;
} else { } else {
sps_seen = 1; sps_seen = 1;
} }
...@@ -115,7 +111,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc, ...@@ -115,7 +111,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
memcpy(out+total_size-unit_size-4, nalu_header, 4); memcpy(out+total_size-unit_size-4, nalu_header, 4);
memcpy(out+total_size-unit_size, extradata+2, unit_size); memcpy(out+total_size-unit_size, extradata+2, unit_size);
extradata += 2+unit_size; extradata += 2+unit_size;
pps:
if (!unit_nb && !sps_done++) { if (!unit_nb && !sps_done++) {
unit_nb = *extradata++; /* number of pps unit(s) */ unit_nb = *extradata++; /* number of pps unit(s) */
if (unit_nb) if (unit_nb)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment