virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

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

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-04-08 12:26:45 +02:00
parent d0df2934ca
commit 9d4cb45dbe
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/h264_mp4toannexb_bsf.c
View File

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