diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 23:43:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 23:55:57 +0200 |
| commit | aff0912da551ed93e8e37ae3e4f2d18cc79cdb36 (patch) | |
| tree | 4e2b736dae1acc0cbb91aedbf6073a41af56e180 /libavcodec/lsp.h | |
| parent | 723adfb1df13fae0d0f675af69958993cafd18dd (diff) | |
| parent | f121dbd9f76031d7f6d56261be2f14937a19d2dd (diff) | |
| download | ffmpeg-aff0912da551ed93e8e37ae3e4f2d18cc79cdb36.tar.gz | |
Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'
* commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd':
mpegts: Provide an option to override the pcr period
Conflicts:
doc/muxers.texi
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lsp.h')
0 files changed, 0 insertions, 0 deletions