summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-15 00:57:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-15 00:57:08 +0100
commitbb4eabacea01b19ef995b06063513588beca8d4a (patch)
treee92750e4185abf94b0e5480eede1b5b200cccbee /libavformat
parentedc26bfae59055bac90853dbc3f9fc9fc959cc1a (diff)
asfdec: restore timestamp reading code
This reverts part of: commit e65ab9d94f1c8d8893e32d90467d9525625d306a Author: Mans Rullgard <mans@mansr.com> Date: Wed Jun 1 17:26:27 2011 +0100 Remove unused variables
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/asfdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 47fde899fb..a254d5d7df 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -812,7 +812,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
ASFContext *asf = s->priv_data;
int rsize = 1;
int num = avio_r8(pb);
- int64_t ts0;
+ int64_t ts0, ts1;
asf->packet_segments--;
asf->packet_key_frame = num >> 7;
@@ -839,7 +839,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
// av_log(s, AV_LOG_DEBUG, "\n");
avio_skip(pb, 10);
ts0= avio_rl64(pb);
- avio_skip(pb, 8);;
+ ts1= avio_rl64(pb);
avio_skip(pb, 12);
avio_rl32(pb);
avio_skip(pb, asf->packet_replic_size - 8 - 38 - 4);