RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

oggdec: Move ogg_find_stream and ogg_gptopts to oggdec.h 

(skeleton will need them)

Originally committed as revision 22455 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-03-11 07:17:33 +00:00
parent 50a9d32310
commit dfaed51f04
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavformat/oggdec.c
View File

@ -145,18 +145,6 @@ ogg_find_codec (uint8_t * buf, int size)
return NULL;
}
static int
ogg_find_stream (struct ogg * ogg, int serial)
{
int i;
for (i = 0; i < ogg->nstreams; i++)
if (ogg->streams[i].serial == serial)
return i;
return -1;
}
static int
ogg_new_stream (AVFormatContext * s, uint32_t serial)
{
@ -440,25 +428,6 @@ ogg_get_headers (AVFormatContext * s)
return 0;
}
static uint64_t
ogg_gptopts (AVFormatContext * s, int i, uint64_t gp, int64_t *dts)
{
struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + i;
uint64_t pts = AV_NOPTS_VALUE;
if(os->codec->gptopts){
pts = os->codec->gptopts(s, i, gp, dts);
} else {
pts = gp;
if (dts)
*dts = pts;
}
return pts;
}
static int
ogg_get_length (AVFormatContext * s)
{

30
libavformat/oggdec.h
View File

@ -115,4 +115,34 @@ extern const AVMetadataConv ff_vorbiscomment_metadata_conv[];
int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
static inline int
ogg_find_stream (struct ogg * ogg, int serial)
{
int i;
for (i = 0; i < ogg->nstreams; i++)
if (ogg->streams[i].serial == serial)
return i;
return -1;
}
static inline uint64_t
ogg_gptopts (AVFormatContext * s, int i, uint64_t gp, int64_t *dts)
{
struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + i;
uint64_t pts = AV_NOPTS_VALUE;
if(os->codec->gptopts){
pts = os->codec->gptopts(s, i, gp, dts);
} else {
pts = gp;
if (dts)
*dts = pts;
}
return pts;
}
#endif /* AVFORMAT_OGGDEC_H */