diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-06 01:50:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-06 01:50:29 +0100 |
| commit | 603a282f8ff1a84677fc0279b6d83e4a23729675 (patch) | |
| tree | 08060d5f3901ac2b7373f0d97854d457519956ee /libavcodec/allcodecs.c | |
| parent | 39c8434bced9a860388628e624170665ddff0e44 (diff) | |
| parent | 973d752dfbfb3286c6494f99744f386b98fda4d7 (diff) | |
| download | ffmpeg-603a282f8ff1a84677fc0279b6d83e4a23729675.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.6' into release/0.6
* qatar/release/0.6:
update version
Release notes and changelog for 0.6.3
Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
cavs: fix some crashes with invalid bitstreams
libvo-aacenc: Sync up with 0.7.2
Fix MMX rgb24 to yuv conversion with gcc 4.6
oggdec: prevent heap corruption.
Fix ff_imdct_calc_sse() on gcc-4.6
backport libvo-aacenc wrapper for aac encoding
Conflicts:
Changelog
VERSION
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index aa3001c546..245a77be78 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -343,6 +343,7 @@ void avcodec_register_all(void) REGISTER_ENCDEC (LIBSCHROEDINGER, libschroedinger); REGISTER_DECODER (LIBSPEEX, libspeex); REGISTER_ENCODER (LIBTHEORA, libtheora); + REGISTER_ENCODER (LIBVO_AACENC, libvo_aacenc); REGISTER_ENCODER (LIBVORBIS, libvorbis); REGISTER_ENCDEC (LIBVPX, libvpx); REGISTER_ENCODER (LIBX264, libx264); |