summaryrefslogtreecommitdiff
path: root/libavcodec/msrledec.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/msrledec.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/msrledec.c')
-rw-r--r--libavcodec/msrledec.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c
index 129f0e0bc0..c0e7682689 100644
--- a/libavcodec/msrledec.c
+++ b/libavcodec/msrledec.c
@@ -260,4 +260,3 @@ int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic, int depth,
return -1;
}
}
-