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/mpegvideo.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/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 28964b0d40..9ab52efd1f 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -859,7 +859,7 @@ void MPV_common_end(MpegEncContext *s) av_freep(&s->reordered_input_picture); av_freep(&s->dct_offset); - if(s->picture && !s->avctx->is_copy){ + if(s->picture && !s->avctx->internal->is_copy){ for(i=0; i<s->picture_count; i++){ free_picture(s, &s->picture[i]); } |