diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-30 01:39:46 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-30 01:55:31 +0100 |
commit | ae3313e1548641e3b4a61520e119729a8b61e061 (patch) | |
tree | c02a97bdede1293f5b180ebfa1ac089cdf8ab8fb /libavformat/mpeg.c | |
parent | af3b6aed0da5e292897b3be099c3cc7a3a44e2c4 (diff) | |
parent | 53c20f17c78d1d8a0fc2505868f201e69ff59cc5 (diff) | |
download | ffmpeg-ae3313e1548641e3b4a61520e119729a8b61e061.tar.gz |
Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'
* commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5':
vp8: K&R formatting cosmetics
Conflicts:
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpeg.c')
0 files changed, 0 insertions, 0 deletions