aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-29 00:34:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-29 00:34:59 +0100
commitc065255bba62ebef145f80cd8d805ef1a9eca133 (patch)
tree675d1241b8488fef70b14a566e59a9070682f08c /libavcodec/utils.c
parent97dece333df07befa4052ed6f5a823ec3103a67d (diff)
parent2e626dd5136f4daa244b37284e22483cdc7df1ac (diff)
downloadffmpeg-c065255bba62ebef145f80cd8d805ef1a9eca133.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index dec9003e1d..a41c8a5596 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -242,7 +242,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
*height+=2; // some of the optimized chroma MC reads one line too much
// which is also done in mpeg decoders with lowres > 0
- for (i = 0; i < AV_NUM_DATA_POINTERS; i++)
+ for (i = 0; i < 4; i++)
linesize_align[i] = STRIDE_ALIGN;
//STRIDE_ALIGN is 8 for SSE* but this does not work for SVQ1 chroma planes
//we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the
@@ -252,7 +252,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
if(s->codec_id == CODEC_ID_SVQ1 || s->codec_id == CODEC_ID_VP5 ||
s->codec_id == CODEC_ID_VP6 || s->codec_id == CODEC_ID_VP6F ||
s->codec_id == CODEC_ID_VP6A || s->codec_id == CODEC_ID_DIRAC) {
- for (i = 0; i < AV_NUM_DATA_POINTERS; i++)
+ for (i = 0; i < 4; i++)
linesize_align[i] = 16;
}
#endif