diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-23 02:23:10 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-23 02:35:31 +0400 |
| commit | 28d3738428128d0bf16ff23995b08b3289179478 (patch) | |
| tree | a45fc603df658badc2cb3eef0da0b340d409ca4a /libavformat/allformats.c | |
| parent | 6c4cc0f640874f6098ef98bad54c3fc0fa7c615f (diff) | |
| parent | dcb9f6a20dbddd1f95b6b322fc4c5fd0b5315729 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add LATM demuxer
avplay: flush audio decoder with empty packets at EOF if the decoder has CODEC_CAP_DELAY set.
8svx/iff: fix decoding of compressed stereo 8svx files.
8svx: log an error message if output buffer is too small
8svx: check packet size before reading the initial sample value.
8svx: output 8-bit samples instead of 16-bit.
8svx: split delta decoding into a separate function.
mp4: Don't read an empty Decoder Config Descriptor
fate.sh: Ignore errors from rm command during cleanup.
fate.sh: Run git-pull in quiet mode to avoid console spam.
Apple ProRes decoder
rtmp: Make the input FLV parser handle data cut at any point
rv34: Check for invalid slices offsets
eval: test isnan(sqrt(-1)) instead of just sqrt(-1)
Conflicts:
Changelog
libavcodec/8svx.c
libavcodec/proresdec.c
libavcodec/version.h
libavformat/iff.c
libavformat/version.h
tests/ref/fate/eval
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index e725b37be5..ecc7c675b9 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -116,7 +116,7 @@ void av_register_all(void) REGISTER_DEMUXER (IV8, iv8); REGISTER_MUXDEMUX (IVF, ivf); REGISTER_DEMUXER (JV, jv); - REGISTER_MUXER (LATM, latm); + REGISTER_MUXDEMUX (LATM, latm); REGISTER_DEMUXER (LMLM4, lmlm4); REGISTER_DEMUXER (LOAS, loas); REGISTER_DEMUXER (LXF, lxf); |