diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 11:36:43 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 11:44:26 +0100 |
commit | 18a964799636a19cceca225ad0264d1408cc3d24 (patch) | |
tree | 31deefd74819e5968f97b10b3648901391ce0c3c /libavcodec/g722dec.c | |
parent | 83ee820a1678937ab8343f2766e9662ef9fd420f (diff) | |
parent | 66a0ac0a802dd794acc1ab8559d3db9e98755b57 (diff) | |
download | ffmpeg-18a964799636a19cceca225ad0264d1408cc3d24.tar.gz |
Merge commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57'
* commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57':
mkv: Add support for DVB subtitles
See: 4789c25d83c4a90e8ef81d2cc05be6d2f12dfa68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722dec.c')
0 files changed, 0 insertions, 0 deletions