• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 1b5a6d3c
    Michael Niedermayer authored
    * qatar/master:
      flacenc: ensure the order is within the min/max range in LPC order search
      avconv: rescale packet duration to muxer time base when flushing encoders
      add 24-bit FLAC encoding to Changelog
      rtpenc_aac: Fix calculation of the header size
      x86: h264_intrapred: port to cpuflags
    
    Conflicts:
    	Changelog
    	libavformat/rtpenc_aac.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    1b5a6d3c
rtpenc_aac.c 2.66 KB