diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-16 00:08:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-16 00:12:24 +0200 |
commit | 13eed267f8c140ca3d69a7a716b917ec7dd77d97 (patch) | |
tree | c126ec2288a2680a698be06658a3033a3bb95593 /libavcodec/alac.c | |
parent | 38b701a3492446d7601336c4938fed2b822aa163 (diff) | |
parent | 31931520df35a6f9606fe8293c8a39e2d1fabedf (diff) | |
download | ffmpeg-13eed267f8c140ca3d69a7a716b917ec7dd77d97.tar.gz |
Merge commit '31931520df35a6f9606fe8293c8a39e2d1fabedf'
* commit '31931520df35a6f9606fe8293c8a39e2d1fabedf':
mov: Do not allow updating the time scale after it has been set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alac.c')
0 files changed, 0 insertions, 0 deletions