diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-18 14:30:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-18 14:45:44 +0200 |
| commit | 91af76099e0649a26a411d3f704a826840006296 (patch) | |
| tree | 900300e9e23c6cb8efbe2772113c5ca29cdfe6f9 /libavcodec/allcodecs.c | |
| parent | 4aade44c4aea69ca40b926682f84635b1e84b47f (diff) | |
| parent | 23aae62c2cb4504a09ceb8cd0cabc1c8b260f521 (diff) | |
Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'
* commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521':
alsdec: Check k used for rice decoder.
avfiltergraph: silence an uninitialized variable warning
xsubenc: reindent
lavc: replace AVCodecContext.encode with subtitle-specific callback
lavc: add const to private codec class initialization.
avconv: don't pass a bogus parameter to avfilter_graph_create_filter().
id3v2: strdup the genre name explicitly.
lavf/id3v2: do not export empty fields.
buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
lavfi: replace empty input/output lists with null pointers
Conflicts:
ffmpeg_filter.c
libavcodec/alsdec.c
libavcodec/dvdsubenc.c
libavcodec/utils.c
libavcodec/v210dec.h
libavfilter/af_channelsplit.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 8806c6a598..03340efa09 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -325,8 +325,6 @@ void avcodec_register_all(void) REGISTER_DECODER (SHORTEN, shorten); REGISTER_DECODER (SIPR, sipr); REGISTER_DECODER (SMACKAUD, smackaud); - REGISTER_ENCDEC (SONIC, sonic); - REGISTER_ENCODER (SONIC_LS, sonic_ls); REGISTER_DECODER (TRUEHD, truehd); REGISTER_DECODER (TRUESPEECH, truespeech); REGISTER_DECODER (TTA, tta); |