diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 23:58:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-16 00:02:39 +0200 |
| commit | 38b701a3492446d7601336c4938fed2b822aa163 (patch) | |
| tree | a078fa4771f33e0808a948a4e1cf3ae50bb22440 /libavfilter/asrc_sine.c | |
| parent | 0b95f01140d0debe5ff6bf54d7490ade7c00421b (diff) | |
| parent | 5b4eb243bce10a3e8345401a353749e0414c54ca (diff) | |
| download | ffmpeg-38b701a3492446d7601336c4938fed2b822aa163.tar.gz | |
Merge commit '5b4eb243bce10a3e8345401a353749e0414c54ca'
* commit '5b4eb243bce10a3e8345401a353749e0414c54ca':
mov: Seek back if overreading an individual atom
Conflicts:
libavformat/mov.c
See: 6093960ae35c8d69c559b5604f683c2ea3f279ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/asrc_sine.c')
0 files changed, 0 insertions, 0 deletions