diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-06-07 20:14:56 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-06-07 20:14:56 +0000 |
| commit | 9ad437eafbb34cedbc9c07f24f9143d9d53e839f (patch) | |
| tree | 76ed87541006c3ab72e2b0059cb508f5c090ae9f /libavcodec/allcodecs.c | |
| parent | 4fcef88c4d015da8e8ba8c2298c24d73eb95e73c (diff) | |
Merge OpenCORE AMR support from trunk.
Originally committed as revision 19133 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 0cb0e6d239..4a6cbc05ed 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -294,6 +294,8 @@ void avcodec_register_all(void) REGISTER_ENCDEC (LIBGSM, libgsm); REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms); REGISTER_ENCODER (LIBMP3LAME, libmp3lame); + REGISTER_ENCDEC (LIBOPENCORE_AMRNB, libopencore_amrnb); + REGISTER_DECODER (LIBOPENCORE_AMRWB, libopencore_amrwb); REGISTER_DECODER (LIBOPENJPEG, libopenjpeg); REGISTER_ENCDEC (LIBSCHROEDINGER, libschroedinger); REGISTER_DECODER (LIBSPEEX, libspeex); |