• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 104f42e6
    Michael Niedermayer authored
    * qatar/master:
      doc/APIchanges: add an entry for codec descriptors.
      vorbisenc: set AVCodecContext.bit_rate to 0
      vorbisenc: fix quality parameter
      FATE: add ALAC encoding tests
      lpc: fix alignment of windowed samples for odd maximum LPC order
      alacenc: use s16p sample format as input
      alacenc: remove unneeded sample_fmt check
      alacenc: fix max_frame_size calculation for the final frame
      adpcm_swf: Use correct sample offsets when using trellis.
      rtmp: support strict rtmp servers
      mjpegdec: support AVRn interlaced
      x86: remove FASTDIV inline asm
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/mjpegdec.c
    	libavcodec/vorbisenc.c
    	libavutil/x86/intmath.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    104f42e6
mjpegdec.c 65.8 KB