diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 10:30:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 10:30:47 +0200 |
| commit | e28fabb4cbe5e7c6cde8a63733d7530f283a0acb (patch) | |
| tree | ff6eab548d790b446ef6a0bb677270dbecb2e21a /libavcodec/sipr.c | |
| parent | 1af921196fbc7e2ddd043c56054bdbafc15a85f6 (diff) | |
| parent | 6c145ecf785dc3d26ba3fed3ea9892cc80244625 (diff) | |
Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'
* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
twinvq: K&R formatting cosmetics
Conflicts:
libavcodec/twinvq.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.c')
0 files changed, 0 insertions, 0 deletions