Merge commit '669fe505'

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

Conflicts:
	libavcodec/twinvq.c

See: 2e7a1fdd
Merged-by: Michael Niedermayer <michaelni@gmx.at>