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 /libswscale | |
| parent | 90c02ae1429b7f50cefdaeeca04b51f978cd1921 (diff) | |
| parent | 09d243ddd0d939e97f3fe0b7f27320763ee41493 (diff) | |
| download | ffmpeg-dbb38bc389e1af5ed465ed370887d6af4da0cb40.tar.gz | |
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 'libswscale')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 5485025b06..adeb409d2f 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -790,7 +790,7 @@ static int check_image_pointers(const uint8_t * const data[4], enum PixelFormat * swscale wrapper, so we don't need to export the SwsContext. * Assumes planar YUV to be in YUV order instead of YVU. */ -int sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[], +int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[], const int srcStride[], int srcSliceY, int srcSliceH, uint8_t* const dst[], const int dstStride[]) { |