diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:17:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:17:57 +0100 |
| commit | 0436ffc294bab3038268db9f6ad32b3a35fcdc65 (patch) | |
| tree | f193551705667193aad8c94cec54cb2b0137ce6e /libavcodec/avcodec.h | |
| parent | a66ee3dc87c5650016df7dcd00c4ce0202f0c3ce (diff) | |
| parent | 53151723e377b9c43f876e20d7f27a17993256c8 (diff) | |
| download | ffmpeg-0436ffc294bab3038268db9f6ad32b3a35fcdc65.tar.gz | |
Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'
* commit '53151723e377b9c43f876e20d7f27a17993256c8':
avio: K&R formatting cosmetics
Conflicts:
libavformat/avio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
0 files changed, 0 insertions, 0 deletions