OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da63aac
)
stream copy pts fix
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 17 Apr 2004 03:34:17 +0000
(
03:34
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 17 Apr 2004 03:34:17 +0000
(
03:34
+0000)
Originally committed as revision 3025 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
d1affc0
..
6168547
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-1145,7
+1145,8
@@
static int output_packet(AVInputStream *ist, int ist_index,
avcodec_get_frame_defaults(&avframe);
ost->st->codec.coded_frame= &avframe;
avframe.key_frame = pkt->flags & PKT_FLAG_KEY;
-
+ ost->st->pts.val= av_rescale(ist->pts, os->pts_den, os->pts_num*AV_TIME_BASE);
+
av_write_frame(os, ost->index, data_buf, data_size);
ost->st->codec.frame_number++;
ost->frame_number++;