Commit 72656670 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '669fe505'

* commit '669fe505':
  twinvq: consume block_align+1 packets as full ones

Conflicts:
	libavcodec/twinvq.c

See: 2e7a1fddMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a24aef5d 669fe505
...@@ -521,7 +521,10 @@ int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data, ...@@ -521,7 +521,10 @@ int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data,
*got_frame_ptr = 1; *got_frame_ptr = 1;
return ret; // VQF can deliver packets 1 byte greater than block align
if (buf_size == avctx->block_align + 1)
return buf_size;
return avctx->block_align;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment