diff options
| author | Michael Niedermayer <[email protected]> | 2014-09-03 12:44:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-09-03 12:44:14 +0200 |
| commit | ee83f667afd276cbec15651948ed8477936b3631 (patch) | |
| tree | 3758d65f102b00da9cdec1694fec325cd50334bb /libavfilter/generate_wave_table.c | |
| parent | 4d13d440ee75321523be88fff1f38f3a154c53b5 (diff) | |
| parent | 7968059e5c3cd8f91407f379c11bbf71a1b84c74 (diff) | |
Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'
* commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74':
mpegts: Allow custom max resync size
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/generate_wave_table.c')
0 files changed, 0 insertions, 0 deletions