Changeset 1b5a6d3c in ffmpeg

Timestamp:

Nov 9, 2012, 9:29:51 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ce1ebb31

Parents:

76935434 (diff), 3a2731cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)