diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:34:16 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:34:16 +0100 |
commit | 50fa5715bcc3e63143e8ae8d1ef57d9e0e6a6325 (patch) | |
tree | 42a0d40d95549de461eb1f15165d2317bc1e81a3 /libavcodec/vc1_block.c | |
parent | 93c61c980d63101d7ea1664fd83c810e95ffdc06 (diff) | |
parent | 8072345e9f86d88fbc4a15c17cb03f1e4701c9a5 (diff) | |
download | ffmpeg-50fa5715bcc3e63143e8ae8d1ef57d9e0e6a6325.tar.gz |
Merge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'
* commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5':
intrax8: Keep a reference to the GetBitContext reader
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/vc1_block.c')
-rw-r--r-- | libavcodec/vc1_block.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 50c50c2cc6..676da53e99 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -2931,7 +2931,7 @@ void ff_vc1_decode_blocks(VC1Context *v) v->s.esc3_level_length = 0; if (v->x8_type) { - ff_intrax8_decode_picture(&v->x8, &v->s.current_picture, + ff_intrax8_decode_picture(&v->x8, &v->s.current_picture, &v->s.gb, 2 * v->pq + v->halfpq, v->pq * !v->pquantizer, v->s.loop_filter); |