diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 05:28:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 05:28:07 +0100 |
| commit | fecebb7abab6cac2dc07393f1d2f2463305dcd31 (patch) | |
| tree | 1ee36cc167b3940d23dba5e147d49746bca60ec4 /libavformat/crypto.c | |
| parent | c9c0451224fd7bc38b4e135e99f114f80c1ae67f (diff) | |
| parent | 5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7 (diff) | |
| download | ffmpeg-fecebb7abab6cac2dc07393f1d2f2463305dcd31.tar.gz | |
Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'
* commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7':
mpeg: K&R formatting cosmetics
Conflicts:
libavformat/mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/crypto.c')
0 files changed, 0 insertions, 0 deletions