diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 12:24:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 12:24:47 +0200 |
| commit | 4d13d440ee75321523be88fff1f38f3a154c53b5 (patch) | |
| tree | c09dc50e69953b1bb09ad7e04dc07112f26a6487 /libavformat/mpegts.c | |
| parent | eacf42dd50885936ae05dd7fd415c4544b9f41cf (diff) | |
| parent | 94f084324e648876508bed546d950762f10b875e (diff) | |
| download | ffmpeg-4d13d440ee75321523be88fff1f38f3a154c53b5.tar.gz | |
Merge commit '94f084324e648876508bed546d950762f10b875e'
* commit '94f084324e648876508bed546d950762f10b875e':
texi2pod: Make it output a single encoding string
Conflicts:
doc/texi2pod.pl
See: 12ce58bebdff6bfae9c56dc785e3003968f93277
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions