diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-23 16:30:51 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-23 16:30:51 +0400 |
| commit | 25ca8aef54b65c77ed36ab5a6877eba18560e6b8 (patch) | |
| tree | 5e90ca85f7a2364a156154e8c9bbc8ca75018736 /ffmpeg.c | |
| parent | e9c372362cb736240dcd87658a027ecfb7b9d240 (diff) | |
| parent | 4a606c830ae664013cea33800094d4d0f4ec62da (diff) | |
Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
* commit '4a606c830ae664013cea33800094d4d0f4ec62da':
av_memcpy_backptr: optimise some special cases
mpegvideo: simplify dxy calculation in hpel_motion()
build: add rules to generate preprocessed source files
Conflicts:
Makefile
libavutil/mem.c
library.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions