diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-23 16:47:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-23 16:47:10 +0200 |
| commit | 5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e (patch) | |
| tree | 38b5f7b209f392584c6829a0dd1fd84a9b70bec1 /libavcodec/allcodecs.c | |
| parent | cc0dc50d027b8aca27b07ef5cededde2e9d96d57 (diff) | |
| parent | b4cfb8254eeeb2fc0aa2c0c36a5ede208af47a79 (diff) | |
| download | ffmpeg-5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dnxhddec: avoid a branch in 10-bit decode_dct_block()
H.264: Add optimizations to predict x86 assembly.
riff: Add mpgv MPEG-2 fourcc
add Flash Screen Video 2 decoder
Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.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 e6305cf7d2..5480c7e78b 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -109,7 +109,7 @@ void avcodec_register_all(void) REGISTER_ENCDEC (FFV1, ffv1); REGISTER_ENCDEC (FFVHUFF, ffvhuff); REGISTER_ENCDEC (FLASHSV, flashsv); - REGISTER_ENCODER (FLASHSV2, flashsv2); + REGISTER_ENCDEC (FLASHSV2, flashsv2); REGISTER_DECODER (FLIC, flic); REGISTER_ENCDEC (FLV, flv); REGISTER_DECODER (FOURXM, fourxm); |