virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)

Browse Source 
Originally committed as revision 1703 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Roman Shaposhnik 2003-03-26 09:28:52 +00:00 committed by Michael Niedermayer
parent 3a694b0456
commit 06219cb194
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libavformat/avidec.c
View File

@ -28,6 +28,7 @@ typedef struct AVIIndex {
} AVIIndex; } AVIIndex;
typedef struct { typedef struct {
int64_t riff_end;
int64_t movi_end; int64_t movi_end;
offset_t movi_list; offset_t movi_list;
AVIIndex *first, *last; AVIIndex *first, *last;
@ -45,6 +46,23 @@ static void print_tag(const char *str, unsigned int tag, int size)
} }
#endif #endif
static int get_riff(AVIContext *avi, ByteIOContext *pb)
{
uint32_t tag;
/* check RIFF header */
tag = get_le32(pb);
if (tag != MKTAG('R', 'I', 'F', 'F'))
return -1;
avi->riff_end = get_le32(pb); /* RIFF chunk size */
avi->riff_end += url_ftell(pb); /* RIFF chunk end */
tag = get_le32(pb);
if (tag != MKTAG('A', 'V', 'I', ' ') && tag != MKTAG('A', 'V', 'I', 'X'))
return -1;
return 0;
}
static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
{ {
AVIContext *avi = s->priv_data; AVIContext *avi = s->priv_data;
@ -55,14 +73,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
int i; int i;
AVStream *st; AVStream *st;
/* check RIFF header */ if (get_riff(avi, pb) < 0)
tag = get_le32(pb);
if (tag != MKTAG('R', 'I', 'F', 'F'))
return -1;
get_le32(pb); /* file size */
tag = get_le32(pb);
if (tag != MKTAG('A', 'V', 'I', ' '))
return -1; return -1;
/* first list tag */ /* first list tag */
@ -230,9 +241,24 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
memset(d, -1, sizeof(int)*8); memset(d, -1, sizeof(int)*8);
for(i=url_ftell(pb); (!url_feof(pb)) && i < avi->movi_end; i++){ for(i=url_ftell(pb); !url_feof(pb); i++) {
int j; int j;
if (i >= avi->movi_end) { /* Let's see if it's an OpenDML AVI */
uint32_t tag, size, tag2;
url_fskip(pb, avi->riff_end - url_ftell(pb));
if (get_riff(avi, pb) < 0)
return -1;
tag = get_le32(pb);
size = get_le32(pb);
tag2 = get_le32(pb);
if (tag == MKTAG('L','I','S','T') && tag2 == MKTAG('m','o','v','i'))
avi->movi_end = url_ftell(pb) + size - 4;
else
return -1;
}
for(j=0; j<7; j++) for(j=0; j<7; j++)
d[j]= d[j+1]; d[j]= d[j+1];
d[7]= get_byte(pb); d[7]= get_byte(pb);