diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 04:24:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 04:24:06 +0200 |
| commit | 12f7253d0ea11c44ac01e1727a2724df060530a8 (patch) | |
| tree | 1bae6e243c09c56f1b0ad1ee09405941060beb17 /doc | |
| parent | f6c524a9399f854602975c7c83c377fc7a4c0d5e (diff) | |
| parent | 82de8d71118f4eafd6a43e9ea9169bd411793798 (diff) | |
| download | ffmpeg-12f7253d0ea11c44ac01e1727a2724df060530a8.tar.gz | |
Merge commit '82de8d71118f4eafd6a43e9ea9169bd411793798'
* commit '82de8d71118f4eafd6a43e9ea9169bd411793798':
mpegts: Update the PSI/SI table only if the version change
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions