diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 19:45:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 19:45:07 +0200 |
| commit | 02a31f6a7490a1a76ac36297ec9bd05f07eeeb24 (patch) | |
| tree | 6516e1c32ec9443d842d50f7e6ee732695286e0c /tools/fourcc2pixfmt.c | |
| parent | 4c18c31438d0f3357fc705b6d03d74728045a17f (diff) | |
| parent | 2c993e8b5ecaeb5c8508ce18d6f4ed93b9246d19 (diff) | |
| download | ffmpeg-02a31f6a7490a1a76ac36297ec9bd05f07eeeb24.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
golomb: K&R formatting cosmetics
Conflicts:
libavcodec/golomb.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/fourcc2pixfmt.c')
0 files changed, 0 insertions, 0 deletions