Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Oct 2012 10:37:52 +0000 (12:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Oct 2012 10:37:52 +0000 (12:37 +0200)
commit04c6ecb7da677049cd52efe2a980e586167e9e5d
tree1a8279cffbc9424ade212f660d0c99314230011a
parentcdea54b4c8cd891aa12f85c41b0cd4bd81be83f9
parentc9ef43215c7d68c2cdcdbe02287aa114f27a32ed
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>
.gitignore
libavcodec/Makefile
libavcodec/mpegvideo.c
libavformat/rtsp.c
libavutil/lzo.c
tests/fate/microsoft.mak
tests/fate/subtitles.mak
tests/fate/video.mak