Commit 9aa1cfec authored by Diego Pettenò's avatar Diego Pettenò Committed by Guillaume Poirier

fix warning reported by Intel C compiler:

libavcodec/h264_parser.c(77): warning #589: transfer of control
bypasses initialization of:
           variable "v" (declared at line 58)
                 goto found;
This new form also improves readability.

Patch by Diego 'Flameeyes' Pettenò %flameeyes A gmail P com%

Originally committed as revision 15526 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2d5174fc
...@@ -59,10 +59,7 @@ int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size) ...@@ -59,10 +59,7 @@ int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size)
if(v==7 || v==8 || v==9){ if(v==7 || v==8 || v==9){
if(pc->frame_start_found){ if(pc->frame_start_found){
i++; i++;
found: goto found;
pc->state=7;
pc->frame_start_found= 0;
return i-(state&5);
} }
}else if(v==1 || v==2 || v==5){ }else if(v==1 || v==2 || v==5){
if(pc->frame_start_found){ if(pc->frame_start_found){
...@@ -80,6 +77,11 @@ found: ...@@ -80,6 +77,11 @@ found:
} }
pc->state= state; pc->state= state;
return END_NOT_FOUND; return END_NOT_FOUND;
found:
pc->state=7;
pc->frame_start_found= 0;
return i-(state&5);
} }
static int h264_parse(AVCodecParserContext *s, static int h264_parse(AVCodecParserContext *s,
......
Markdown is supported
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