Changeset 4727ec3c in ffmpeg

Timestamp:

Apr 12, 2011, 1:48:21 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a299a261

Parents:

13d4ec84 (diff), db46be01 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/12/11 01:43:43)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/12/11 01:48:21)

Message:

Merge remote branch 'qatar/master'

• qatar/master:

Not pulled due to wrong author, according to carl: Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().

Fix compilation of timefilter test program.
Add support for AMR-WB encoding via libvo-amrwbenc
Add an AAC encoder by using the libvo-aacenc library
g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

Conflicts:

Changelog

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

(No files)