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:
5d2b885
)
examples/muxing: fix video pts
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 17 Oct 2012 00:32:43 +0000
(
02:32
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 17 Oct 2012 00:40:00 +0000
(
02:40
+0200)
Fixes Ticket1801
Based on suggestion from AztecC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
doc/examples/muxing.c
patch
|
blob
|
history
diff --git
a/doc/examples/muxing.c
b/doc/examples/muxing.c
index
56790ec
..
c0b0ec7
100644
(file)
--- a/
doc/examples/muxing.c
+++ b/
doc/examples/muxing.c
@@
-382,9
+382,6
@@
static void write_video_frame(AVFormatContext *oc, AVStream *st)
/* If size is zero, it means the image was buffered. */
if (got_output) {
- if (c->coded_frame->pts != AV_NOPTS_VALUE)
- pkt.pts = av_rescale_q(c->coded_frame->pts,
- c->time_base, st->time_base);
if (c->coded_frame->key_frame)
pkt.flags |= AV_PKT_FLAG_KEY;
@@
-509,7
+506,7
@@
int main(int argc, char **argv)
write_audio_frame(oc, audio_st);
} else {
write_video_frame(oc, video_st);
- frame->pts
++
;
+ frame->pts
+= av_rescale_q(1, video_st->codec->time_base, video_st->time_base)
;
}
}