diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 12:44:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 12:44:14 +0200 |
| commit | ee83f667afd276cbec15651948ed8477936b3631 (patch) | |
| tree | 3758d65f102b00da9cdec1694fec325cd50334bb /libavformat/nut.c | |
| parent | 4d13d440ee75321523be88fff1f38f3a154c53b5 (diff) | |
| parent | 7968059e5c3cd8f91407f379c11bbf71a1b84c74 (diff) | |
| download | ffmpeg-ee83f667afd276cbec15651948ed8477936b3631.tar.gz | |
Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'
* commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74':
mpegts: Allow custom max resync size
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nut.c')
0 files changed, 0 insertions, 0 deletions