diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-16 12:38:59 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-16 12:45:01 +0200 |
commit | a9b613b60e5108692d329c5779e1cc7488cadf0d (patch) | |
tree | fb200c10c53451dfc8ae1d94208d8a5f9740d24d /libavdevice/x11grab.c | |
parent | 293a8e426fc05db44ac8952a1f62b254e9362f3f (diff) | |
parent | 979932378ae3fbf452e312eb759cc7ce175f78de (diff) | |
download | ffmpeg-a9b613b60e5108692d329c5779e1cc7488cadf0d.tar.gz |
Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'
* commit '979932378ae3fbf452e312eb759cc7ce175f78de':
ismindex: use tfhd default duration if no sample duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/x11grab.c')
0 files changed, 0 insertions, 0 deletions