diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:20:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:20:43 +0100 |
| commit | 925ce6faf4ddfaf8b0422de181b19bd75fa0dd68 (patch) | |
| tree | ff22cd0992c54c40c9026a796a0d06aae6224141 /libavcodec/aac_ac3_parser.h | |
| parent | b7a5f5dc6662ed3d4641063ba62d3d03021db9f8 (diff) | |
| parent | f8bbebecfd7ea3dceb7c96f931beca33f80a3490 (diff) | |
| download | ffmpeg-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/aac_ac3_parser.h')
0 files changed, 0 insertions, 0 deletions