[FFmpeg-cvslog] r15556 - trunk/libavformat/avidec.c
michael
subversion
Sat Oct 4 23:57:01 CEST 2008
Author: michael
Date: Sat Oct 4 23:57:01 2008
New Revision: 15556
Log:
Factorize stream id parsing.
Modified:
trunk/libavformat/avidec.c
Modified: trunk/libavformat/avidec.c
==============================================================================
--- trunk/libavformat/avidec.c (original)
+++ trunk/libavformat/avidec.c Sat Oct 4 23:57:01 2008
@@ -614,6 +614,15 @@ static int avi_read_header(AVFormatConte
return 0;
}
+static int get_stream_idx(int *d){
+ if( d[0] >= '0' && d[0] <= '9'
+ && d[1] >= '0' && d[1] <= '9'){
+ return (d[0] - '0') * 10 + (d[1] - '0');
+ }else{
+ return 100; //invalid stream ID
+ }
+}
+
static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIContext *avi = s->priv_data;
@@ -756,12 +765,7 @@ resync:
size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24);
- if( d[2] >= '0' && d[2] <= '9'
- && d[3] >= '0' && d[3] <= '9'){
- n= (d[2] - '0') * 10 + (d[3] - '0');
- }else{
- n= 100; //invalid stream id
- }
+ n= get_stream_idx(d+2);
//av_log(NULL, AV_LOG_DEBUG, "%X %X %X %X %X %X %X %X %"PRId64" %d %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
if(i + size > avi->fsize || d[0]<0)
continue;
@@ -776,12 +780,7 @@ resync:
goto resync;
}
- if( d[0] >= '0' && d[0] <= '9'
- && d[1] >= '0' && d[1] <= '9'){
- n= (d[0] - '0') * 10 + (d[1] - '0');
- }else{
- n= 100; //invalid stream ID
- }
+ n= get_stream_idx(d);
//parse ##dc/##wb
if(n < s->nb_streams){
More information about the ffmpeg-cvslog
mailing list