diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 20:47:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 20:47:13 +0200 |
| commit | 56efd98a6574641a32f08cd5123725cef28a309b (patch) | |
| tree | 27a85d0dc0eb40d0ad99e96bb7684514be3da44f /libavcodec/allcodecs.c | |
| parent | ecb815e5117f3353ed3e67bb737029773d170212 (diff) | |
| parent | e2834567d73bd1e46478ba67ac133cb8ef5f50fd (diff) | |
| download | ffmpeg-56efd98a6574641a32f08cd5123725cef28a309b.tar.gz | |
Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
On2 AVC decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
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 456d702950..a1cd44e983 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -370,6 +370,7 @@ void avcodec_register_all(void) REGISTER_DECODER(MPC7, mpc7); REGISTER_DECODER(MPC8, mpc8); REGISTER_ENCDEC (NELLYMOSER, nellymoser); + REGISTER_DECODER(ON2AVC, on2avc); REGISTER_DECODER(PAF_AUDIO, paf_audio); REGISTER_DECODER(QCELP, qcelp); REGISTER_DECODER(QDM2, qdm2); |