diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-09 00:05:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-09 00:05:51 +0100 |
| commit | 25b9eef410f4a737250dcf2d17b65f6c0c39cd6a (patch) | |
| tree | a1a8c88aca0b5a88a6fd0c2e9ac1008698f34fea /libavcodec/allcodecs.c | |
| parent | b229485f1ad38162927b235a359b98ff5a0dc13a (diff) | |
| parent | 6b60a4c9c94bbe03afc8e0851197d97d96f644e5 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cljr: K&R cosmetics
cljr: return a more sensible value when encountering invalid headers
cljr: drop unnecessary emms_c() calls without MMX code
cljr: remove useless casts
cljr: group encode/decode parts under single ifdefs
cljr: remove stray semicolon
cljr: add missing return statement in decode_end()
doc: add pulseaudio to the input list
avconv: remove unsubstantiated comment
shorten: avoid abort() on unknown audio types
cljr: add encoder
build: merge lists of HTML documentation targets
tests/examples: Mark some variables only used within their files as static.
tests/tools/examples: Replace direct exit() calls by return.
x86 cpuid: set vendor union members separately
cljr: release picture at end of decoding
rv40: NEON optimised rv40 qpel motion compensation
Conflicts:
doc/examples/muxing.c
libavcodec/cljr.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 02df6f20ab..19afbd4895 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -89,7 +89,7 @@ void avcodec_register_all(void) REGISTER_DECODER (CAVS, cavs); REGISTER_DECODER (CDGRAPHICS, cdgraphics); REGISTER_DECODER (CINEPAK, cinepak); - REGISTER_DECODER (CLJR, cljr); + REGISTER_ENCDEC (CLJR, cljr); REGISTER_DECODER (CSCD, cscd); REGISTER_DECODER (CYUV, cyuv); REGISTER_DECODER (DFA, dfa); |