aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-01 20:44:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-01 20:55:42 +0200
commit141ee109132a2e79adf4b9067a3bef2d061967b1 (patch)
tree7c8e5ebab12e20fba66a9e0979bf4169ae31d429 /doc
parentee78b0c252e54b7e26043d060b45c22654719ffb (diff)
parent48e6432407a73d5006d84609456e6e0bc3dd8fc4 (diff)
downloadffmpeg-141ee109132a2e79adf4b9067a3bef2d061967b1.tar.gz
Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'
* commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4': matroska: Factor out mkv_write_stereo_mode Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions