OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
73e0ec2
)
ffmpeg: fix -re
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 9 Sep 2011 17:54:04 +0000
(19:54 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 9 Sep 2011 17:54:04 +0000
(19:54 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
0d26440
..
cbb92c8
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-3265,6
+3265,7
@@
static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
input_files[nb_input_files - 1].ist_index = nb_input_streams - ic->nb_streams;
input_files[nb_input_files - 1].ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp);
input_files[nb_input_files - 1].nb_streams = ic->nb_streams;
+ input_files[nb_input_files - 1].rate_emu = o->rate_emu;
top_field_first = -1;
frame_rate = (AVRational){0, 0};