har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

indentation

Browse Source 
patch by Andreas Öman: [andreas olebyn nu]

Originally committed as revision 9360 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Andreas Öman 2007-06-18 08:48:26 +00:00 committed by Benoit Fouet
parent b33ece1634
commit 1c48415bb9
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavcodec/h264.c
View File

@ -7683,32 +7683,32 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
uint8_t *ptr; uint8_t *ptr;
int i, nalsize = 0; int i, nalsize = 0;
if(h->is_avc) { if(h->is_avc) {
if(buf_index >= buf_size) break; if(buf_index >= buf_size) break;
nalsize = 0; nalsize = 0;
for(i = 0; i < h->nal_length_size; i++) for(i = 0; i < h->nal_length_size; i++)
nalsize = (nalsize << 8) | buf[buf_index++]; nalsize = (nalsize << 8) | buf[buf_index++];
if(nalsize <= 1 || (nalsize+buf_index > buf_size)){ if(nalsize <= 1 || (nalsize+buf_index > buf_size)){
if(nalsize == 1){ if(nalsize == 1){
buf_index++; buf_index++;
continue; continue;
}else{ }else{
av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize); av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
break; break;
}
}
} else {
// start code prefix search
for(; buf_index + 3 < buf_size; buf_index++){
// This should always succeed in the first iteration.
if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
break;
} }
}
} else {
// start code prefix search
for(; buf_index + 3 < buf_size; buf_index++){
// This should always succeed in the first iteration.
if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
break;
}
if(buf_index+3 >= buf_size) break; if(buf_index+3 >= buf_size) break;
buf_index+=3; buf_index+=3;
} }
ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index);
if (ptr==NULL || dst_length < 0){ if (ptr==NULL || dst_length < 0){