aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-17 23:00:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-17 23:06:38 +0200
commit00aa2ebb1c3eb7aa4251e2fe2d5540d755bb1922 (patch)
treee8dbf99efc2c705a422dd97cc0b630392d68a3f4 /doc
parent887d85fdcc4737e2bdc076123631db33cdad0c6b (diff)
parent369380e1c4c6fc9b0d9ff04ec23d46b252ba7110 (diff)
downloadffmpeg-00aa2ebb1c3eb7aa4251e2fe2d5540d755bb1922.tar.gz
Merge commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110'
* commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110': mxf: Support AAC Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions