Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Nov 2012 09:29:51 +0000 (10:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Nov 2012 09:29:51 +0000 (10:29 +0100)
commit1b5a6d3c4966fb67d79445aca9c1ad6c1ecbdd4b
treec9ba394ee683ee33501a52b655542087c9d76071
parent769354348a3acddb36582277a7d3f26e6d179369
parent3a2731cbd31d0c5681ddbc7c78edd5c53c4d0032
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/flacenc.c
libavcodec/x86/h264_intrapred.asm
libavformat/rtpenc_aac.c