aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-14 01:20:43 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-14 01:20:43 +0100
commit925ce6faf4ddfaf8b0422de181b19bd75fa0dd68 (patch)
treeff22cd0992c54c40c9026a796a0d06aae6224141 /libavcodec/aacenc.c
parentb7a5f5dc6662ed3d4641063ba62d3d03021db9f8 (diff)
parentf8bbebecfd7ea3dceb7c96f931beca33f80a3490 (diff)
downloadffmpeg-925ce6faf4ddfaf8b0422de181b19bd75fa0dd68.tar.gz
Merge commit 'f8bbebecfd7ea3dceb7c96f931beca33f80a3490'
* commit 'f8bbebecfd7ea3dceb7c96f931beca33f80a3490': x86: motion_est: K&R formatting cosmetics Conflicts: libavcodec/x86/motion_est.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacenc.c')
0 files changed, 0 insertions, 0 deletions