diff options
| author | Michael Niedermayer <[email protected]> | 2014-02-20 02:01:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-02-20 02:01:13 +0100 |
| commit | 6a24d77929e0d5425c79a081034719ac68199602 (patch) | |
| tree | 5300b75b67ae1494e494333730e4234a16562839 /libavformat/mpegts.c | |
| parent | f4c8d002231afbc181e97c512e459ec6860f7098 (diff) | |
| parent | c3ecd968f0e78da6e77f0c06c2f785b266d83cf1 (diff) | |
Merge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1'
* commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1':
AVOptions: add flags for read/read-only options
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions