[FFmpeg-cvslog] asfdec: restore timestamp reading code
Michael Niedermayer
git at videolan.org
Tue Nov 15 01:29:38 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 15 00:57:08 2011 +0100| [bb4eabacea01b19ef995b06063513588beca8d4a] | committer: Michael Niedermayer
asfdec: restore timestamp reading code
This reverts part of:
commit e65ab9d94f1c8d8893e32d90467d9525625d306a
Author: Mans Rullgard <mans at mansr.com>
Date: Wed Jun 1 17:26:27 2011 +0100
Remove unused variables
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb4eabacea01b19ef995b06063513588beca8d4a
---
libavformat/asfdec.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 47fde89..a254d5d 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);
More information about the ffmpeg-cvslog
mailing list