diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-15 13:28:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-15 13:28:38 +0100 |
commit | 231795270b67496e01ad87731e0e95853146f038 (patch) | |
tree | faa735beb3fe1e0c3c05de3881222c86d72e4839 /libavutil/opt.c | |
parent | 9df00574fca16b3c8aa9892f9a3ed5bd6482833a (diff) | |
parent | b164d66e35d349de414e2f0d7365a147aba8a620 (diff) | |
download | ffmpeg-231795270b67496e01ad87731e0e95853146f038.tar.gz |
Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'
* commit 'b164d66e35d349de414e2f0d7365a147aba8a620':
ape: make version-dependent decoding functions called via pointers
mpegts: add support for stream_type 0x42, which is CAVS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.c')
0 files changed, 0 insertions, 0 deletions