projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
ce1059d
)
Merge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 22 Aug 2014 18:59:49 +0000
(20:59 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 22 Aug 2014 19:00:06 +0000
(21:00 +0200)
* commit '
cb7b1a2dfb547ab78342a7a9d5cd729d77d90421
':
electronicarts: set the framerate for TGQ/TQI
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/electronicarts.c
patch
|
blob
|
history
diff --git
a/libavformat/electronicarts.c
b/libavformat/electronicarts.c
index
0ae6512
..
9000f7f
100644
(file)
--- a/
libavformat/electronicarts.c
+++ b/
libavformat/electronicarts.c
@@
-412,10
+412,12
@@
static int process_ea_header(AVFormatContext *s)
case pQGT_TAG:
case TGQs_TAG:
ea->video_codec = AV_CODEC_ID_TGQ;
+ ea->time_base = (AVRational) { 1, 15 };
break;
case pIQT_TAG:
ea->video_codec = AV_CODEC_ID_TQI;
+ ea->time_base = (AVRational) { 1, 15 };
break;
case MADk_TAG: