aboutsummaryrefslogtreecommitdiffstats
path: root/libpostproc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-21 21:02:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-21 21:26:01 +0100
commit5af0a701a1c0356fd1a79671de1cf06974e78d76 (patch)
tree7c1e424ffaeb54ecab2972b498eedf776b701253 /libpostproc
parent0c3ebbf6a54dc2b422c0c75b468a9979c097fd87 (diff)
parentaa8b39d999589154f79300de9038994d0093cd34 (diff)
downloadffmpeg-5af0a701a1c0356fd1a79671de1cf06974e78d76.tar.gz
Merge commit 'aa8b39d999589154f79300de9038994d0093cd34'
* commit 'aa8b39d999589154f79300de9038994d0093cd34': lavc: Move the libtwolame encoder registration to the list for external libraries Conflicts: libavcodec/allcodecs.c See: f5f98727b361c62d3962cef37a100db95d62b702 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
0 files changed, 0 insertions, 0 deletions