• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2a976deb
    Michael Niedermayer authored
    * qatar/master:
      dv: Initialize encoder tables during encoder init.
      dv: Replace some magic numbers by the appropriate #define.
      FATE: pass the decoded output format and audio source file to enc_dec_pcm
      FATE: specify the input format when decoding in enc_dec_pcm()
      x86inc: support AVX abstraction for 2-operand instructions
      configure: detect PGI compiler and set suitable flags
      avconv: check for an incompatible changing channel layout
      avio: make AVIOContext.av_class pointer to const
      nutdec: add malloc check and fix const to non-const conversion warnings
    
    Conflicts:
    	ffmpeg.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2a976deb
avio.h 15.8 KB