diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:19:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:19:12 +0200 |
| commit | 057c5d2e1646ee9536edf514b41690c8ffeef6fc (patch) | |
| tree | bf58adcb1284160226259906d380bee583e5a5eb /libavcodec/libvpxenc.c | |
| parent | 86c9cf643b0b75b05e33971a10cf00b052f7bfac (diff) | |
| parent | 72e228b274a98af1aba9588415d0cd87fde44663 (diff) | |
| download | ffmpeg-057c5d2e1646ee9536edf514b41690c8ffeef6fc.tar.gz | |
Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'
* commit '72e228b274a98af1aba9588415d0cd87fde44663':
nut: K&R formatting cosmetics
Conflicts:
libavformat/nut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvpxenc.c')
0 files changed, 0 insertions, 0 deletions