diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 12:37:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 12:37:52 +0200 |
| commit | 04c6ecb7da677049cd52efe2a980e586167e9e5d (patch) | |
| tree | 1a8279cffbc9424ade212f660d0c99314230011a /.gitignore | |
| parent | cdea54b4c8cd891aa12f85c41b0cd4bd81be83f9 (diff) | |
| parent | c9ef43215c7d68c2cdcdbe02287aa114f27a32ed (diff) | |
| download | ffmpeg-04c6ecb7da677049cd52efe2a980e586167e9e5d.tar.gz | |
Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'
* commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed':
fate-vc1: add dependencies
ARM: fix overreads in neon h264 chroma mc
rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
gitignore: ignore files created by msvc
fate: Add proper dependencies for the tests in video.mak
configure: Disable Snow decoder and encoder by default
lzo: Drop obsolete fast_memcpy reference
build: Drop OBJS declaration for non-existing PCM_DVD encoder
mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all
Conflicts:
libavcodec/mpegvideo.c
libavformat/rtsp.c
tests/fate/microsoft.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index ab860625a4..0b00f07e50 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,12 @@ *.dll *.dylib *.exe +*.exp *.h.c +*.ilk *.lib *.pc +*.pdb *.so *.so.* *.ver |