virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Change nsvf_index_data to nsvs_file_offset for increased clarity.

Browse Source 
Originally committed as revision 18603 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Jai Menon 2009-04-18 05:54:47 +00:00
parent 9f5ff83f2a
commit 67d04927f7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/nsvdec.c
View File

@ -171,7 +171,7 @@ typedef struct NSVStream {
typedef struct { typedef struct {
int base_offset; int base_offset;
int NSVf_end; int NSVf_end;
uint32_t *nsvf_index_data; uint32_t *nsvs_file_offset;
int index_entries; int index_entries;
enum NSVStatus state; enum NSVStatus state;
AVPacket ahead[2]; /* [v, a] if .data is !NULL there is something */ AVPacket ahead[2]; /* [v, a] if .data is !NULL there is something */
@ -350,9 +350,9 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap)
nsv->index_entries = table_entries_used; nsv->index_entries = table_entries_used;
if((unsigned)table_entries >= UINT_MAX / sizeof(uint32_t)) if((unsigned)table_entries >= UINT_MAX / sizeof(uint32_t))
return -1; return -1;
nsv->nsvf_index_data = av_malloc(table_entries * sizeof(uint32_t)); nsv->nsvs_file_offset = av_malloc(table_entries * sizeof(uint32_t));
#warning "FIXME: Byteswap buffer as needed" #warning "FIXME: Byteswap buffer as needed"
get_buffer(pb, (unsigned char *)nsv->nsvf_index_data, table_entries * sizeof(uint32_t)); get_buffer(pb, (unsigned char *)nsv->nsvs_file_offset, table_entries * sizeof(uint32_t));
} }
PRINT(("NSV got index; filepos %"PRId64"\n", url_ftell(pb))); PRINT(("NSV got index; filepos %"PRId64"\n", url_ftell(pb)));
@ -364,11 +364,11 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap)
PRINT(("NSV [dataoffset][fileoffset]\n", table_entries)); PRINT(("NSV [dataoffset][fileoffset]\n", table_entries));
for (i = 0; i < table_entries; i++) { for (i = 0; i < table_entries; i++) {
unsigned char b[8]; unsigned char b[8];
url_fseek(pb, size + nsv->nsvf_index_data[i], SEEK_SET); url_fseek(pb, size + nsv->nsvs_file_offset[i], SEEK_SET);
get_buffer(pb, b, 8); get_buffer(pb, b, 8);
PRINT(("NSV [0x%08lx][0x%08lx]: %02x %02x %02x %02x %02x %02x %02x %02x" PRINT(("NSV [0x%08lx][0x%08lx]: %02x %02x %02x %02x %02x %02x %02x %02x"
"%c%c%c%c%c%c%c%c\n", "%c%c%c%c%c%c%c%c\n",
nsv->nsvf_index_data[i], size + nsv->nsvf_index_data[i], nsv->nsvs_file_offset[i], size + nsv->nsvs_file_offset[i],
b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7],
V(b[0]), V(b[1]), V(b[2]), V(b[3]), V(b[4]), V(b[5]), V(b[6]), V(b[7]) )); V(b[0]), V(b[1]), V(b[2]), V(b[3]), V(b[4]), V(b[5]), V(b[6]), V(b[7]) ));
} }
@ -700,7 +700,7 @@ static int nsv_read_close(AVFormatContext *s)
NSVContext *nsv = s->priv_data; NSVContext *nsv = s->priv_data;
if (nsv->index_entries) if (nsv->index_entries)
av_free(nsv->nsvf_index_data); av_free(nsv->nsvs_file_offset);
#if 0 #if 0