aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/nutenc.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-03 20:11:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-05 02:29:31 +0100
commit384c9c2fa79f2f09ed4a5aa4c14ba3ffc6bdc790 (patch)
treea3ec8979530bffeb61b84161d1681120bf1234af /libavformat/nutenc.c
parent773947ba76c575abc01ba128206c87440dad40ec (diff)
downloadffmpeg-384c9c2fa79f2f09ed4a5aa4c14ba3ffc6bdc790.tar.gz
avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
Diffstat (limited to 'libavformat/nutenc.c')
-rw-r--r--libavformat/nutenc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 078ffac0ba..8ecefb012e 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -639,13 +639,13 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){
if(pkt->pts < 0)
return -1;
- if(1LL<<(20+3*nut->header_count) <= url_ftell(bc))
+ if(1LL<<(20+3*nut->header_count) <= avio_tell(bc))
write_headers(s, bc);
if(key_frame && !(nus->last_flags & FLAG_KEY))
store_sp= 1;
- if(pkt->size + 30/*FIXME check*/ + url_ftell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
+ if(pkt->size + 30/*FIXME check*/ + avio_tell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
store_sp= 1;
//FIXME: Ensure store_sp is 1 in the first place.
@@ -668,7 +668,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){
sp= av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp,
NULL);
- nut->last_syncpoint_pos= url_ftell(bc);
+ nut->last_syncpoint_pos= avio_tell(bc);
ret = url_open_dyn_buf(&dyn_bc);
if(ret < 0)
return ret;