• Michael Niedermayer's avatar
    Merge commit 'c9ef4321' · 04c6ecb7
    Michael Niedermayer authored
    * commit 'c9ef4321
    
    ':
      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: default avatarMichael Niedermayer <michaelni@gmx.at>
    04c6ecb7