aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING.LGPLv3
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-23 16:44:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-23 16:44:30 +0100
commit826188d27acdef6bf14edf018415e958f59ecfdd (patch)
tree09fd9e72118f51f60452f3b6ccb25af6cc1e9c0b /COPYING.LGPLv3
parent86b892af199d420fe2bcf5f8fb96c377d924ad43 (diff)
parented1b01131e662c9086b27aaaea69684d8575fbea (diff)
downloadffmpeg-826188d27acdef6bf14edf018415e958f59ecfdd.tar.gz
Merge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea'
* commit 'ed1b01131e662c9086b27aaaea69684d8575fbea': mlp: implement support for AVCodecContext.request_channel_layout. Conflicts: libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.LGPLv3')
0 files changed, 0 insertions, 0 deletions