diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 12:16:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 12:16:31 +0200 |
| commit | 4a6f1be170a057ee3d582e5f110ed659926c093c (patch) | |
| tree | fe4a945dcd5272bc828e1387e43b8a83d282e11a /ffmpeg.h | |
| parent | e1acfd3cb0543815316ede06232d13e002562daa (diff) | |
| parent | 39523030108815242178ac5e209c83070bd1baef (diff) | |
| download | ffmpeg-4a6f1be170a057ee3d582e5f110ed659926c093c.tar.gz | |
Merge commit '39523030108815242178ac5e209c83070bd1baef'
* commit '39523030108815242178ac5e209c83070bd1baef':
mov: Set the timescale for data streams
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions