summaryrefslogtreecommitdiff
path: root/libavformat/nutdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-08-09 18:37:28 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-08-09 18:37:28 +0000
commitf13ea4e00c583d819f279a455d3f0a02e40ef0ae (patch)
tree5a2b305b2b29614e48e5b9047cb5894798820543 /libavformat/nutdec.c
parent9031aeb1cd8b0a5b5d4e6c11824a86c9c11ddcb2 (diff)
move lsb2full to common file
Originally committed as revision 10025 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/nutdec.c')
-rw-r--r--libavformat/nutdec.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 322ed2518e..3143f384d0 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -155,12 +155,6 @@ static int64_t find_startcode(ByteIOContext *bc, uint64_t code, int64_t pos){
}
}
-static int64_t lsb2full(StreamContext *stream, int64_t lsb){
- int64_t mask = (1<<stream->msb_pts_shift)-1;
- int64_t delta= stream->last_pts - mask/2;
- return ((lsb - delta)&mask) + delta;
-}
-
static int nut_probe(AVProbeData *p){
int i;
uint64_t code= 0;
@@ -655,7 +649,7 @@ static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, in
int coded_pts= get_v(bc);
//FIXME check last_pts validity?
if(coded_pts < (1<<stc->msb_pts_shift)){
- *pts=lsb2full(stc, coded_pts);
+ *pts=ff_lsb2full(stc, coded_pts);
}else
*pts=coded_pts - (1<<stc->msb_pts_shift);
}else