diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-17 23:57:50 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-17 23:59:00 +0200 |
commit | 2d2b5a1421ee652f76a756024d0210f0b6455fda (patch) | |
tree | d3fb60a796db87c4217167fd160cd14eae6ee98e /libavcodec/wmavoice.c | |
parent | c40798441f47341c310b38e8f329cfb943924faf (diff) | |
download | ffmpeg-2d2b5a1421ee652f76a756024d0210f0b6455fda.tar.gz |
10l, commit that should have been stashed into the merge.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmavoice.c')
-rw-r--r-- | libavcodec/wmavoice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index b1aea9f880..dfdfabbbb3 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1912,7 +1912,7 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data, *data_size = 0; /* Packets are sometimes a multiple of ctx->block_align, with a packet - * header at each ctx->block_align bytes. However, Libav's ASF demuxer + * header at each ctx->block_align bytes. However, FFmpeg's ASF demuxer * feeds us ASF packets, which may concatenate multiple "codec" packets * in a single "muxer" packet, so we artificially emulate that by * capping the packet size at ctx->block_align. */ |