• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 64b25938
    Michael Niedermayer authored
    * qatar/master:
      dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.
      dnxhdenc: add space between function argument type and comment.
      x86: fmtconvert: add special asm for float_to_int16_interleave_misc_*
      attributes: Add a definition of av_always_inline for MSVC
      cmdutils: Pass the actual chosen encoder to filter_codec_opts
      os_support: Add fallback definitions for stat flags
      os_support: Rename the poll fallback function to ff_poll
      network: Check for struct pollfd
      os_support: Don't compare a negative number against socket descriptors
      os_support: Include all the necessary headers for the win32 open function
      x86: vc1: fix and enable optimised loop filter
    
    Conflicts:
    	cmdutils.c
    	cmdutils.h
    	ffmpeg.c
    	ffplay.c
    	libavformat/os_support.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    64b25938
ffmpeg.c 220 KB