projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
464ccb0
)
avconv: update InputStream.pts in the streamcopy case.
author
Anton Khirnov
<anton@khirnov.net>
Mon, 28 Nov 2011 10:47:02 +0000
(11:47 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Wed, 30 Nov 2011 06:47:43 +0000
(07:47 +0100)
This was broken in
2a651b719c309c5e2fc663a5a9d6ca36153ab98f
.
avconv.c
patch
|
blob
|
history
diff --git
a/avconv.c
b/avconv.c
index
4c5498a
..
067678d
100644
(file)
--- a/
avconv.c
+++ b/
avconv.c
@@
-1906,6
+1906,7
@@
static int output_packet(InputStream *ist,
/* handle stream copy */
if (!ist->decoding_needed) {
rate_emu_sleep(ist);
+ ist->pts = ist->next_pts;
switch (ist->st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO:
ist->next_pts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) /