diff options
author | David Conrad <lessen42@gmail.com> | 2010-03-11 10:17:33 +0300 |
---|---|---|
committer | David Conrad <lessen42@gmail.com> | 2010-03-11 10:17:33 +0300 |
commit | dfaed51f04128953f1a8c44a1f5114d5a330d252 (patch) | |
tree | 2ecd5ff469314a2ed723745845fdd425ae17c2dc /libavformat | |
parent | 50a9d32310e7a67fa3a9b2c92d5ed70ac00261e4 (diff) |
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
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/oggdec.c | 31 | ||||
-rw-r--r-- | libavformat/oggdec.h | 30 |
2 files changed, 30 insertions, 31 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 3ebd61bbbc..f079946ee6 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -146,18 +146,6 @@ ogg_find_codec (uint8_t * buf, int size) } 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) { diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 425d7a291e..aa6e8990b0 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -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 */ |