diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 02:46:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 02:46:06 +0100 |
| commit | dbb38bc389e1af5ed465ed370887d6af4da0cb40 (patch) | |
| tree | 8998bdad7433fa92d6008ebb8a096e9dd1460340 /libavcodec/vp8.c | |
| parent | 90c02ae1429b7f50cefdaeeca04b51f978cd1921 (diff) | |
| parent | 09d243ddd0d939e97f3fe0b7f27320763ee41493 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Fix stack alignment for SSE
avcodec: move some AVCodecContext fields to an internal struct.
avcodec: use av_opt_set() instead of deprecated av_set_string3()
avcodec: fix some const warnings
avcodec: remove pointless AVOption, internal_buffer_count
imgutils: Fix illegal read.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp8.c')
| -rw-r--r-- | libavcodec/vp8.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 37bdcf7525..b374fa4222 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -24,6 +24,7 @@ #include "libavutil/imgutils.h" #include "avcodec.h" +#include "internal.h" #include "vp8.h" #include "vp8data.h" #include "rectangle.h" @@ -88,7 +89,7 @@ static void vp8_decode_flush_impl(AVCodecContext *avctx, VP8Context *s = avctx->priv_data; int i; - if (!avctx->is_copy) { + if (!avctx->internal->is_copy) { for (i = 0; i < 5; i++) if (s->frames[i].data[0]) vp8_release_frame(s, &s->frames[i], prefer_delayed_free, can_direct_free); |