diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 21:14:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 21:15:18 +0100 |
| commit | b3818c47d8ba3cdae5e924afde797123352ce2a5 (patch) | |
| tree | 0b37302ddd311e13b31f05367b20b4ad846b8f92 /libswscale/arm | |
| parent | c59654d67d1afde3fac24021ef0fd9d18cf38455 (diff) | |
| parent | 8692d74b7364b405d7939c0ed347e8a2815193a7 (diff) | |
| download | ffmpeg-b3818c47d8ba3cdae5e924afde797123352ce2a5.tar.gz | |
Merge commit '8692d74b7364b405d7939c0ed347e8a2815193a7'
* commit '8692d74b7364b405d7939c0ed347e8a2815193a7':
mov: Add option to keep exact packet sequence after seeking
Conflicts:
libavformat/isom.h
libavformat/mov.c
libavformat/version.h
See: 414d6547f33175b3f53eb3320aa13161a584a151
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/arm')
0 files changed, 0 insertions, 0 deletions