Changeset f3543969 in ffmpeg

Timestamp:

Apr 3, 2011, 12:28:01 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

78431098

Parents:

85c9365d (diff), bc154882 (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 branch 'qatar/master'

• qatar/master: Fixed-point MDCT with 32-bit unscaled output lavc: deprecate rate_emu lavc: mark hurry_up for removal on next major bump parser: mark av_parser_parse() for removal on next major bump lavc: add missing audioconvert includes jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

Conflicts:

libavcodec/h264.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)