diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 04:34:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 04:34:17 +0200 |
| commit | c1e7fb60d1ea397e4833b71cf50825a0f2a5b61e (patch) | |
| tree | 74539abcd5b42f06dd3d2513a7d3a98cd3d15b7a /libavfilter/vf_pad.c | |
| parent | 2aeeb3ba1f4fa54d0cd4cca672bc56dea07af133 (diff) | |
| parent | c065f4a0c652cc569c927c95148111b3aa2962dc (diff) | |
| download | ffmpeg-c1e7fb60d1ea397e4833b71cf50825a0f2a5b61e.tar.gz | |
Merge commit 'c065f4a0c652cc569c927c95148111b3aa2962dc'
* commit 'c065f4a0c652cc569c927c95148111b3aa2962dc':
huffyuv: K&R formatting cosmetics
Conflicts:
libavcodec/huffyuvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_pad.c')
0 files changed, 0 insertions, 0 deletions