diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 12:36:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 12:36:04 +0200 |
| commit | 54bbb9056801b778126a4bf5036d9d3638da1802 (patch) | |
| tree | 6cffb68457486351ced1dc2f59f0db246aa8a5dc /libavcodec/x86 | |
| parent | c6953589f9c48a7420ea4284f404fb656ddf869f (diff) | |
| parent | 170fb593c617cd797d00cf05bfb8d8c21d612893 (diff) | |
| download | ffmpeg-54bbb9056801b778126a4bf5036d9d3638da1802.tar.gz | |
Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'
* commit '170fb593c617cd797d00cf05bfb8d8c21d612893':
pcx: K&R formatting cosmetics
Conflicts:
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
0 files changed, 0 insertions, 0 deletions