diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-03 23:16:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-03 23:16:15 +0100 |
| commit | 222e7549a74d75fcf91440ebcff997ee5416296d (patch) | |
| tree | ec72b8e0c06b9f0298256338768650e96e2a49f8 /libavresample | |
| parent | eb2244ece9cbc4bd26dea553c318635a98c9d6de (diff) | |
| parent | 7933039ade01b39638ec3d9e638b6ae06ee84984 (diff) | |
| download | ffmpeg-222e7549a74d75fcf91440ebcff997ee5416296d.tar.gz | |
Merge commit '7933039ade01b39638ec3d9e638b6ae06ee84984' into release/2.2
* commit '7933039ade01b39638ec3d9e638b6ae06ee84984':
af_resample: preserve frame properties
avconv: Do not divide by zero
dca: replace some memcpy by AV_COPY128
h264: avoid undefined behavior in chroma motion compensation
x86: dsputil: Use correct file name as multiple inclusion guard
Conflicts:
ffmpeg.c
All changes are already in our 2.2 branch, this is just for metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions