virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Fix playback with invalid files that don't set the continuation flag for

Browse Source 
pages that continue packets started in prior pages.
Fixes issue1248

Originally committed as revision 21688 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad
2010-02-08 10:13:03 +00:00
parent 55a7e946f6
commit ecc0027bc6
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/oggdec.c
View File

@@ -122,6 +122,7 @@ ogg_reset (struct ogg * ogg)
os->lastdts = AV_NOPTS_VALUE; os->lastdts = AV_NOPTS_VALUE;
os->nsegs = 0; os->nsegs = 0;
os->segp = 0; os->segp = 0;
os->incomplete = 0;
} }
ogg->curidx = -1; ogg->curidx = -1;
@@ -268,7 +269,7 @@ ogg_read_page (AVFormatContext * s, int *str)
for (i = 0; i < nsegs; i++) for (i = 0; i < nsegs; i++)
size += os->segments[i]; size += os->segments[i];
if (flags & OGG_FLAG_CONT){ if (flags & OGG_FLAG_CONT || os->incomplete){
if (!os->psize){ if (!os->psize){
while (os->segp < os->nsegs){ while (os->segp < os->nsegs){
int seg = os->segments[os->segp++]; int seg = os->segments[os->segp++];
@@ -356,6 +357,7 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize)
if (!complete && os->segp == os->nsegs){ if (!complete && os->segp == os->nsegs){
ogg->curidx = -1; ogg->curidx = -1;
os->incomplete = 1;
} }
}while (!complete); }while (!complete);
@@ -366,6 +368,7 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize)
#endif #endif
ogg->curidx = idx; ogg->curidx = idx;
os->incomplete = 0;
if (os->header < 0){ if (os->header < 0){
int hdr = os->codec->header (s, idx); int hdr = os->codec->header (s, idx);

1
libavformat/oggdec.h
View File

@@ -71,6 +71,7 @@ struct ogg_stream {
int header; int header;
int nsegs, segp; int nsegs, segp;
uint8_t segments[255]; uint8_t segments[255];
int incomplete; ///< whether we're expecting a continuation in the next page
int page_end; ///< current packet is the last one completed in the page int page_end; ///< current packet is the last one completed in the page
void *private; void *private;
}; };