diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 23:17:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 23:25:46 +0200 |
| commit | ac26d7ea9da4758377624e633ca47cd01e2210d2 (patch) | |
| tree | 950080d0339760a36a44a98dfe70182eb9abf229 /libavutil/buffer.c | |
| parent | 8d02a55b1b93bfd0574306631d2de7614bfb47b4 (diff) | |
| parent | a736ae1e96b8718af0962106aa40df5f4b246b55 (diff) | |
| download | ffmpeg-ac26d7ea9da4758377624e633ca47cd01e2210d2.tar.gz | |
Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'
* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55':
doc: Document mpegts muxrate
Conflicts:
doc/muxers.texi
See: 5b76c3a1204944a74f4c1fb4ce1ebe58940e7f78
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/buffer.c')
0 files changed, 0 insertions, 0 deletions