• 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
Name
Last commit
Last update
..
fate Loading commit data...
ref Loading commit data...
Makefile Loading commit data...
asynth1.sw Loading commit data...
audiogen.c Loading commit data...
base64.c Loading commit data...
codec-regression.sh Loading commit data...
copycooker.sh Loading commit data...
fate-run.sh Loading commit data...
fate-update.sh Loading commit data...
fate-valgrind.supp Loading commit data...
fate.sh Loading commit data...
fate_config.sh.template Loading commit data...
ffserver-regression.sh Loading commit data...
ffserver.conf Loading commit data...
ffserver.regression.ref Loading commit data...
lavf-regression.sh Loading commit data...
lavfi-regression.sh Loading commit data...
lena.pnm Loading commit data...
md5.sh Loading commit data...
regression-funcs.sh Loading commit data...
rotozoom.c Loading commit data...
tiny_psnr.c Loading commit data...
videogen.c Loading commit data...