aboutsummaryrefslogtreecommitdiffstats
path: root/RELEASE
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-20 22:21:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-20 22:26:31 +0100
commit011d83de488d2051c485a1618dda0a43d77bcbc7 (patch)
treedbde540836a29c1effe020f0a92c1c5978cd3c8d /RELEASE
parent3775224b2f8a9c2c0bf5d53272236d4a1ffb0875 (diff)
parent0e083d7e43805db1a978cb57bfa25fda62e8ff18 (diff)
downloadffmpeg-011d83de488d2051c485a1618dda0a43d77bcbc7.tar.gz
Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'
* commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18': build: Group general components separate from de/encoders in arch Makefiles Conflicts: libavcodec/arm/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'RELEASE')
0 files changed, 0 insertions, 0 deletions