diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 23:46:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 23:52:44 +0100 |
| commit | b3d9ab182929c64d65f36035770dc8d1a8513196 (patch) | |
| tree | 0937598968e520968b7a95e9cf043f66102fb9f5 /libswresample/Makefile | |
| parent | 84bccae8e9ac02e5088a684b6a7855896c2195eb (diff) | |
| parent | 84cfce9f99805a144df684417e166c1ae6f95421 (diff) | |
| download | ffmpeg-b3d9ab182929c64d65f36035770dc8d1a8513196.tar.gz | |
Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'
* commit '84cfce9f99805a144df684417e166c1ae6f95421':
matroskadec: K&R formatting cosmetics
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/Makefile')
0 files changed, 0 insertions, 0 deletions