Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-24 14:34:58 +0300
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-24 14:34:58 +0300
commit52692eed615cc6dd05edae5505044401059408a0 (patch)
tree90f11cee3af67ac92a3bb963d3b544b58c2f113d /libavcodec/vc1dec.c
parent50fa5715bcc3e63143e8ae8d1ef57d9e0e6a6325 (diff)
parent1eaae7abb8f208fefb4e8b9e983e61b2499206a3 (diff)
Merge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'
* commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3': intrax8: Reference the current AVCodecContext Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/vc1dec.c')
-rw-r--r--libavcodec/vc1dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 25251c820e..786c6dbefc 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -387,7 +387,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
return AVERROR(ENOMEM);
}
- ret = ff_intrax8_common_init(&v->x8, &s->idsp, s);
+ ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, s);
if (ret < 0)
goto error;