generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another variable that did nothing at all

Browse Source 
Originally committed as revision 13998 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-06-26 22:43:18 +00:00
parent 73d3a14d82
commit 7669935ac4
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/psxstr.c
View File

@ -62,8 +62,6 @@ typedef struct StrDemuxContext {
/* a STR file can contain up to 32 channels of data */ /* a STR file can contain up to 32 channels of data */
StrChannel channels[32]; StrChannel channels[32];
int64_t pts;
} StrDemuxContext; } StrDemuxContext;
static const char sync_header[12] = {0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00}; static const char sync_header[12] = {0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00};
@ -117,9 +115,6 @@ static int str_read_header(AVFormatContext *s,
int i; int i;
int channel; int channel;
/* initialize context members */
str->pts = 0;
/* skip over any RIFF header */ /* skip over any RIFF header */
if (get_buffer(pb, sector, RIFF_HEADER_SIZE) != RIFF_HEADER_SIZE) if (get_buffer(pb, sector, RIFF_HEADER_SIZE) != RIFF_HEADER_SIZE)
return AVERROR(EIO); return AVERROR(EIO);
@ -259,12 +254,6 @@ static int str_read_packet(AVFormatContext *s,
pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE; pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE;
pkt->stream_index = pkt->stream_index =
str->channels[channel].video_stream_index; str->channels[channel].video_stream_index;
// pkt->pts = str->pts;
/* if there is no audio, adjust the pts after every video
* frame; assume 15 fps */
if (0)
str->pts += (90000 / 15);
} }
memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE, memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE,
@ -294,7 +283,6 @@ printf (" dropping audio sector\n");
pkt->stream_index = pkt->stream_index =
str->channels[channel].audio_stream_index; str->channels[channel].audio_stream_index;
//pkt->pts = str->pts;
return 0; return 0;
#endif #endif
break; break;