diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 16:52:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 16:52:09 +0100 |
| commit | 516f30ed20828c04459cb2fd3b18a0bd2de4cdf0 (patch) | |
| tree | ac3ebb07e51372de8a815b417f89c5c61e135adb /libavfilter/vf_decimate.c | |
| parent | 0ff21c316534776f9b3ba5ae51242ae1a976909e (diff) | |
| parent | 0ee8293a77a6afad161e91ce1d43c4a57ce33a6a (diff) | |
| download | ffmpeg-516f30ed20828c04459cb2fd3b18a0bd2de4cdf0.tar.gz | |
Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'
* commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a':
vp3dsp: don't do aligned reads on input.
mlp_parser: cosmetics: re-indent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_decimate.c')
0 files changed, 0 insertions, 0 deletions