diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 00:27:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:28:02 +0100 |
| commit | f9e76d66e93a888e79fbddc2d6bb7b778c856d20 (patch) | |
| tree | fd2968bf8b8005322a43cb75459033de96e407b9 /libavcodec/adpcmenc.c | |
| parent | 7b564a4cbb447362e9160dde58f4fdb9f3097431 (diff) | |
| parent | 4abfa387b8234736f6e0e541951e3d5eb60eb843 (diff) | |
| download | ffmpeg-f9e76d66e93a888e79fbddc2d6bb7b778c856d20.tar.gz | |
Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'
* commit '4abfa387b8234736f6e0e541951e3d5eb60eb843':
mov: Change DTS-based seek into CTS-based seek.
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcmenc.c')
0 files changed, 0 insertions, 0 deletions