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/mimic.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/mimic.c')
| -rw-r--r-- | libavcodec/mimic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 3bdb562503..1cac84fc66 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -24,6 +24,7 @@ #include <stdint.h> #include "avcodec.h" +#include "internal.h" #include "get_bits.h" #include "bytestream.h" #include "dsputil.h" @@ -405,7 +406,8 @@ static av_cold int mimic_decode_end(AVCodecContext *avctx) av_free(ctx->swap_buf); - if(avctx->is_copy) return 0; + if (avctx->internal->is_copy) + return 0; for(i = 0; i < 16; i++) if(ctx->buf_ptrs[i].data[0]) |