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:
41f7e06
)
ffmpeg: complete mov/mp4 based timebase hack with "f4v" format.
author
Clément Bœsch
<clement.boesch@smartjog.com>
Fri, 21 Sep 2012 13:57:09 +0000
(15:57 +0200)
committer
Clément Bœsch
<ubitux@gmail.com>
Fri, 21 Sep 2012 15:27:57 +0000
(17:27 +0200)
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
c48aec7
..
a30ffb1
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-2057,6
+2057,7
@@
static int transcode_init(void)
} else if(!(oc->oformat->flags & AVFMT_VARIABLE_FPS)
&& strcmp(oc->oformat->name, "mov") && strcmp(oc->oformat->name, "mp4") && strcmp(oc->oformat->name, "3gp")
&& strcmp(oc->oformat->name, "3g2") && strcmp(oc->oformat->name, "psp") && strcmp(oc->oformat->name, "ipod")
+ && strcmp(oc->oformat->name, "f4v")
) {
if( copy_tb<0 && icodec->time_base.den
&& av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base)