diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-23 01:09:43 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-23 01:09:43 +0200 |
commit | e16665bf72d226b2c87c76a677414b8ef7720d7e (patch) | |
tree | b68414614d4ce2eecee89185f80a30a039899bb2 /libavcodec/vqavideo.c | |
parent | 03ac7991286c583c73c8c44c71aeba1265c61cba (diff) | |
parent | d9dee728b8c50fb6dbff3701e1abcb2eac5895b3 (diff) | |
download | ffmpeg-streaming-e16665bf72d226b2c87c76a677414b8ef7720d7e.zip ffmpeg-streaming-e16665bf72d226b2c87c76a677414b8ef7720d7e.tar.gz |
Merge remote branch 'qatar/master'
* qatar/master:
Use av_log_ask_for_sample() to request samples from users.
Make av_log_ask_for_sample() accept a variable number of arguments.
vqavideo: We no longer need to ask for version 1 samples.
aacdec: indentation cosmetics
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vqavideo.c')
-rw-r--r-- | libavcodec/vqavideo.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index f0ecda6..109faab 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -464,8 +464,6 @@ static void vqa_decode_chunk(VqaContext *s) switch (s->vqa_version) { case 1: -/* still need sample media for this case (only one game, "Legend of - * Kyrandia III : Malcolm's Revenge", is known to use this version) */ lobyte = s->decode_buffer[lobytes * 2]; hibyte = s->decode_buffer[(lobytes * 2) + 1]; vector_index = ((hibyte << 8) | lobyte) >> 3; |