virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

Merge commit '669fe505952f3d8175b1ad6971033a8e8120523b'

Browse Source 
* commit '669fe505952f3d8175b1ad6971033a8e8120523b':
  twinvq: consume block_align+1 packets as full ones

Conflicts:
	libavcodec/twinvq.c

See: 2e7a1fdd6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-14 16:01:57 +01:00
parent a24aef5dfa 669fe50595
commit 726566704f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/twinvq.c
View File

@ -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;
} }
/** /**