diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 13:38:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 13:38:25 +0100 |
| commit | b5448e66b0b88da95a3c8f08a2b2d416049585a5 (patch) | |
| tree | 80dee250d35d2fb54621ba430d452d0900037465 /libavutil/camellia.c | |
| parent | 25d7e3ad594a8b5ed1b840d75185df34efdde6ad (diff) | |
| parent | 67a2912307c3c08f2725ccae162cfe3426b80184 (diff) | |
| download | ffmpeg-b5448e66b0b88da95a3c8f08a2b2d416049585a5.tar.gz | |
Merge commit '67a2912307c3c08f2725ccae162cfe3426b80184'
* commit '67a2912307c3c08f2725ccae162cfe3426b80184':
movenc: Don't assume that fragment durations in pts is equal to duration in dts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/camellia.c')
0 files changed, 0 insertions, 0 deletions