• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 1e19927f
    Michael Niedermayer authored
    * qatar/master:
      vc1: use an enum for Frame Coding Mode
      doc: cleanup filter section
      indeo3: error out if no motion vector is set.
      x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.
      mpegaudio: do not use init_static_data() for initializing tables.
      musepack: fix signed shift overflow in mpc_read_packet()
      mov: Make format string match variable type.
      wmavoice: Make format string match variable type.
      vc1: select interlaced scan table by FCM element
      Generalize RIFF INFO tag support; support reading INFO tag in wav
      pthread: track thread existence in a separate variable.
    
    Conflicts:
    	doc/filters.texi
    	libavcodec/pthread.c
    	libavformat/avi.c
    	libavformat/riff.c
    	libavformat/riff.h
    	libavformat/wav.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    1e19927f
riff.h 2.86 KB