diff options
| author | Michael Niedermayer <[email protected]> | 2011-04-17 23:36:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2011-04-17 23:43:54 +0200 |
| commit | c40798441f47341c310b38e8f329cfb943924faf (patch) | |
| tree | c23fbec614c59bcf14c7377d1c6ff7abdfa34353 /libavformat/oggparsespeex.c | |
| parent | c96786008172f669e546ca987e7aaa3c3469be71 (diff) | |
| parent | fd0c3403f611d31b944216cfa1585a2d28f7f0da (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
ac3dec: fix processing of delta bit allocation information.
vc1: fix fate-vc1 after previous commit.
wmv3dec: fix playback of complex WMV3 files using simple_idct.
make av_dup_packet() more cautious on allocation failures
make containers pass palette change in AVPacket
introduce side information for AVPacket
Politic commits that have not been pulled:
Update regtest checksums after revision 6001dad.
Replace more FFmpeg references by Libav.
Replace references to ffmpeg-devel with libav-devel; fix roundup URL.
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/oggparsespeex.c')
| -rw-r--r-- | libavformat/oggparsespeex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c index 80b2001ddf..2f4aec7f07 100644 --- a/libavformat/oggparsespeex.c +++ b/libavformat/oggparsespeex.c @@ -59,7 +59,7 @@ static int speex_header(AVFormatContext *s, int idx) { st->codec->channels = AV_RL32(p + 48); /* We treat the whole Speex packet as a single frame everywhere Speex - is handled in FFmpeg. This avoids the complexities of splitting + is handled in Libav. This avoids the complexities of splitting and joining individual Speex frames, which are not always byte-aligned. */ st->codec->frame_size = AV_RL32(p + 56); |